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

Change-Id: Ie66d7974be62bb0db5bfcf73a3ddbb28cd9f8390