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

* commit 'a1e60d6822ee466c30a37b3f45a450f2ca2ef46d':
  Move more into libadb and libadbd.