Merge "liblog: use log/log.h when utilizing ALOG macros"