Merge "liblog: use log/log.h when utilizing ALOG macros" am: 1c10b4ec13
am: ab92bfe4dd

Change-Id: I20f3b1798f10a24ef6aaf2ee0b6f8b547c9d50b8