Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors"
am: 02359c6d96

Change-Id: I6e0a517b28aa112e7305f81874baca1832c7ed8a