Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1