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

Change-Id: Ie4227d04492fdb6d571eca3f7637e650180b4716