am 33baee5d: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev

* commit '33baee5d88974a3b668f9d7f0716eed815966773':
  Add android.hardware.camera.any feature to camera permissions.