Merge "Use consistent SMCCC error code" into integration