am 3fb79e36: am 9dc5d30b: Merge "Fix build. New clang has stricter checking."

* commit '3fb79e3664159ce412fc155429e852b1923de381':
  Fix build. New clang has stricter checking.