Merge "Move more into libadb and libadbd."