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

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