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