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

* commit '47b0946bce6c576667d539281b271104c6018480':
  Remove the emulator special case from the "adb root" code.