Merge "plat/arm: use Aff3 bits also to validate mpidr" into integration