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

Change-Id: I14be05411d78c21fd790777b48b9dbf133f434ef