Merge "liblog: use log/log.h for ALOG macros"
am: 59cfe7de39

Change-Id: Ic961061fc8b320bc6e8525005ade7423d09ad79b