am f4e2151a: am 7a697dd3: Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev

* commit 'f4e2151a3c0e1f209d027a6ad7d6cb0225019b37':
  add camera.goldfish.jpeg to emulator targets and mini targets