Merge "Revert "Remove the emulator special case from the "adb root" code.""