am 88c30fb6: am eaeb55f7: Merge "Start losing code to libadb."

* commit '88c30fb652ad40835f1d1045e2c851ff8813e873':
  Start losing code to libadb.