Merge "Add test to verify emulator launched in AVD can be detected." am: 949d42d161
am: 25ec369226

Change-Id: Ice7ad50adb2bf99bfb0759a8b585ef7274c55da7