Merge "adb: Cleanup dead code"