Merge "liblog: convert to C++" am: c5ce8a8ef7 am: 25b3cf46f9
am: b673e6a541

Change-Id: I19e1723117aa8e7ae65568c5d173e19a893d658b