Fix compile Camera and fixes

Change-Id: Ic26b6c18fc08c47aa0876f2835e2d2bf340180c0