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