Merge "adb: turn CHECKs into an error + transport restart."