Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230 am: 15b18326b6
am: 49d3b5ee8e

Change-Id: I87a85c85d3f509e0496f5946d6e9e58174398ea5