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

* commit '85497fb9148e498b5f4123b6fb68dd712ee3f0d5':
  Remove the emulator special case from the "adb root" code.