am 917486bb: Merge "Add missing ioctl used by N4 camera."

* commit '917486bb2d1e7a1fd6588eb35e7e4232e3075a93':
  Add missing ioctl used by N4 camera.