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

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