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