Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"

This reverts commit 0ced06ea0f20cf8bd6a1a2b2e34531f04f621c00.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build