am 37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk

* commit '37773821f150778c48ef3519407d8ee71dd66a30':
  DO NOT MERGE: Combine emulator test projects into a single apk