Merge "liblog: cleanup opaque type usage"