Merge "camera 3_4: Fix compilation errors" am: 7904e9c2d7
am: 8a08d159fd

Change-Id: Id6d08971d1625c0f57143a1d2f33228735d3915b