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