Merge changes I377f250a,Ia6d6ac8a into lts-v2.8

* changes:
  fix(cpus): workaround for Cortex-A715 erratum 2561034
  fix(cpus): workaround for Cortex X3 erratum 2641945