am 111c882b: am ee223d50: Merge "adb: Increase the max number of emulator instances to 64"

* commit '111c882b3ca61a3a3c069d0ad69b64053f991e15':
  adb: Increase the max number of emulator instances to 64