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

* commit '159f84a4e05fad785818fc1bdd790f9f06835fa4':
  Fix build. New clang has stricter checking.