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

Change-Id: I18bb16c18bd2f69cd17a4093c05e29d7d1100051