am c0e6eebf: am 8d2abbea: Merge "Switch adb over to clang."

* commit 'c0e6eebfae9818201ed4ad0d4aa5487f85a978ab':
  Switch adb over to clang.