am 7fe1e6c3: am a1e60d68: am a75b4935: Merge "Move more into libadb and libadbd."

* commit '7fe1e6c3e54cf90617bab9f6ea0432254dccef74':
  Move more into libadb and libadbd.