Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec
am: 71bf335ffa

Change-Id: Id07d468c8e95af39e189f53919a0ac6aabc9604c