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

* commit '54b3aa93edbc4aeb094c7767e943518d2e4416a8':
  Switch adb over to clang.