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

Change-Id: Ia3e363af051c3d3feba3eb657904db4c89d9539d