Merge "Switch to clang-2577113."
am: 1acfd54844

* commit '1acfd54844354d137dd90d5f4485cab771e51da0':
  Switch to clang-2577113.