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

Change-Id: I842839441f726d83b5a883004b79f8c9a8a91f3d