am 70385f30: Merge "Remove the emulator special case from the "adb root" code."

* commit '70385f3017366ecf06af7a073a2fb955e93d01ba':
  Remove the emulator special case from the "adb root" code.