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

Change-Id: Iab735fcd94483bff17ef08bd48b471a26beb6de1