Merge "fix(el3-spmc): fix incorrect CASSERT" into integration