Merge "adb: remove adisconnect in aremotesocket."