am 0f832535: am a3e8a6ad: adb: Fix emulator support.

Merge commit '0f83253596e7c23c98c141224238841a3102e5f6'

* commit '0f83253596e7c23c98c141224238841a3102e5f6':
  adb: Fix emulator support.