Merge "liblog: use log/log.h for ALOG macros"