Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev