am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects...
am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master
* commit '97f49221':
DO NOT MERGE: Combine emulator test projects into a single apk