Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec am: 71bf335ffa
am: 8790fb2613

Change-Id: I8ccebdc05c7f280a101af02032d41413c198ef39