Merge "Fix adb sync/pull/push error reporting."