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

* commit '9a357b38d30dedbf7905c1531c304f278cde142b':
  Switch to clang-2577113.