Merge "file_sync_client.cpp: include strerror() in adb_read() failures." into main