Revert 'Fix adb root'