Merge "trusty: use log/log.h for ALOG macros" am: dc40813167
am: 8548d54b2f

Change-Id: Ibb9c38532e779a322858c5f018f713f46d065f3c