Merge "fix(xilinx): use lib/smccc.h macros instead of trusty spd" into integration