Merge "refactor(errata_abi): update the cpu structs for errata ABI" into lts-v2.10