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

Change-Id: Ib3997fc85907ae75eb6616ce58edcb3b171c6e35