Merge branch 'tracking-cortex-strings-arm64' into merge-linux-linaro