Merge "liblog: convert to C++"
am: c5ce8a8ef7

Change-Id: Ic8d8c11071211f3a8cb8a0302b36b8c776619d0b