Merge "adb: clean up handle_host_request."