Merge "adb: delete hellish hodgepodge."