Merge "adb: Remove unused flags"