Merge "liblog: use log/log.h when utilizing ALOG macros" am: 9a30f044ca
am: 70a969c6fc

Change-Id: I5b2e4fa842edf56ab85c6bcb24997e537c02d5de