Merge "Make liblog headers compile stand-alone." am: fe3551e9dc
am: b637860732

Change-Id: I4a4a7ac46e18765243b5c8ed27414e16c9008f54