Backport patch to fix arm64 baseline architecture