Merge "camera: avoid narrowing of the ioctl request" am: eef57caed9
am: 3d22b204f2

Change-Id: Ia143066265775612b1ff27002106a15bf9478c19