Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091 am: 112d1dcd95
am: 33807cd6c2

Change-Id: I341970b6ddb6610418d85a378ef2984861858c65