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

Change-Id: Ief005e48c622a3221d83e8f06beb1de125048233