Merge "liblog: use log/log.h when utilizing ALOG macros"
am: 9a30f044ca

Change-Id: Ibf35cc60eeb53bc421a2f886fa63b37ffa2083c1