Refactor out adb library