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

Change-Id: I4d7c3fdd614592bcd52ca181b02414827b227967