am a3e8a6ad: adb: Fix emulator support.

Merge commit 'a3e8a6ad56d60d2ad6c580004f86920d73acc62c' into eclair-plus-aosp

* commit 'a3e8a6ad56d60d2ad6c580004f86920d73acc62c':
  adb: Fix emulator support.