Merge branch 'arm64-klib' into upstream