am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev

* commit 'eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED