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

* commit 'f9275dda76b351f6888fe80b63638f9d9c8c4fa7':

Change-Id: I00444f8a45ae32bb3e75977da200a435edb2df9d