Merge "liblog: use log/log.h when utilizing ALOG macros" am: bc47cb1dc6 am: 0610e6ad56
am: 7ee55a24a8

Change-Id: I0ce45a25d2a68910dcfe7bec700734fc00fc99d7