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