Merge "fix(arm): correct the RESET_TO_BL31 x1 handoff arg" into integration