Merge "adb: add option to disable kill-server."