Merge "Fix build. New clang has stricter checking."