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