Merge "liblog: use log/log.h when utilizing ALOG macros" am: 818ffb15a6
am: ca5117d1f3

Change-Id: I4138b85520ec911e81c109b1d73ba07914128a2b