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

Change-Id: Ib5b1d8dbd98957bb409bece5be84dfb10f4b23fc