Merge "liblog: convert to C++"