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

Change-Id: I4211adc8ed161e871356fba83205556e78dc0238