Merge "Remove adb from host build in buildbot."