Merge "Fix arm64 build warning (promoted to error)."