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

Change-Id: Ifd80582ea416eeb60ad03240e35730d076967792