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

Change-Id: I0d124cf79d331cde00ccce07dfa6215e66e52360