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

Change-Id: I503be65fbe7c7f40f6700705f70184eebba182ab