Merge "Remove arm64 clang build warning"