Merge "Fix "adb sync" (and "adb push") error reporting." am: d0d87f78e5
am: 59021ad415

* commit '59021ad415f10004eb7f936bc55062efc027b9b4':
  Fix "adb sync" (and "adb push") error reporting.