Merge "Merge "adb: search for a maximum of 16 emulators." into nyc-dev am: 72e47300fb am: 2928f7df70" into nyc-mr1-dev-plus-aosp