Merge "trusty: use log/log.h for ALOG macros"