Merge "adb: search for a maximum of 16 emulators." into nyc-dev