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

* commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d':
  Start losing code to libadb.