am 3be2d3d8: am 48d7489e: Merge "Fix build with clang"

* commit '3be2d3d87983fedbfefa5852b32a81dc45d6e1ae':
  Fix build with clang