Merge "refactor(errata_abi): add the Cortex-X4 cpu struct" into lts-v2.10