Merge "Still cannot compile with clang on arm64."