am ea4f39e8: Merge "Switch to Clang 3.6."

* commit 'ea4f39e86d315793390fb84b5b4d667aa4d3917b':
  Switch to Clang 3.6.