am 64a5ff96: Merge "Begin moving code from adb to libadb."

* commit '64a5ff963c894f9ff622ae1de370a98f2bd5af62':
  Begin moving code from adb to libadb.