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

Change-Id: Iffcccf38a94bc5f09c02e732e977118dc7e62ed7