Merge "Add test to verify emulator launched in AVD can be detected."