Merge "plat/arm: Retrieve the right ROTPK when using the dualroot CoT" into integration