Merge "modules/camera: Fix compiler warnings" am: f7888e1130
am: f832261e65

Change-Id: Iab1dadfb9626ba2c79641623c1a2dd834a914a7d