Merge "Revert "adb: Do not use fs_config unless we are root (try 2)."" into main