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

Change-Id: Idfca5de8347a38c3ab2cf0da002e3a2e4657d5e2