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

Change-Id: I5c05336b1899ca7f92ccd548daa5e578c0d4bd89