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