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

* commit 'f6ab64affe8cbd1ab8c163635faa557be58a207a':
  Restore CAMERA permission to ApiDemos.