Merge "adbd: don't spin if file sync read fails." am: 32d2eae8b9 am: 4dc1892491
am: 43898a6add

Change-Id: Icc7d13bc5e7ff2aaf63f95f046734fb77db6d72e