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

Change-Id: I3f14dbab761d08019b93bd053645f0a718e8aeb5