Merge "Changes to support updated register usage in SMCCC v1.2" into integration