Merge "Some minor fixes to libadb_tls_connection." am: 8f04b0ca58 am: 7a15d5c88f

Change-Id: I32238ce9abd608ff290d903df5b75fdd81d49cae