am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test...
am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
* commit 'e8e7ebbd':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""