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