Merge "Cortex-A55: workarounds for errata 1221012" into integration