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

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