Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
tree: 3d24c1439ca41413cfeac107b3901a02b74f7704
  1. jni_mosaic/
  2. res/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/