Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY" am: 2ea787137f am: 902c974556 am: c84504bf53

Change-Id: I5eddd7707094d4b2049f8107e725cc3abc0ede43