Merge "Create separate header for ARM specific SMCCC defines" into integration