Merge "camera 3_4: Fix compilation errors" am: 7904e9c2d7 am: 8a08d159fd
am: b0d95c4bb8  -s ours

Change-Id: I3fc0bd56305642281b92a0c7c9791ec4e9d33bea