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

Change-Id: If487706ed52943b8034334146286026ddbc5535a