am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""

* commit '8f03e3cb3db392127fd8dc0a2ce62aa15a755ffd':
  Revert "Remove the emulator special case from the "adb root" code."