Merge "Combine emulator test projects into a single apk"