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

Change-Id: I567d9f71c6407a7cb96ffa2e910a4b1c05876c87