Merge "liblog: use log/log.h when utilizing ALOG macros" am: 818ffb15a6 am: ca5117d1f3
am: 7c3240795a

Change-Id: I74c378d0d67bd4bd95a757712d56b94ca542ab02