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

Change-Id: Idbd1c1556d3867c9b9a0247c845530b2cb16fc47