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

Change-Id: I5f4906534e4b892566776b8ee0f005fb6543c283