Merge "Revert "Reimplement the "adb root" command to more closely match its previous behavior""