Merge "liblog: use log/log.h to access main logging macros"