Merge "refactor(errata_abi): add Cortex-X925 and update Cortex-X4"