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

* commit 'a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
  Revert "DO NOT MERGE: Combine emulator test projects into a single apk"