Merge "Fix "adb sync" (and "adb push") error reporting."