Turn  makeTlsTolerant into two methods.

See https://android-review.googlesource.com/48700
Merge pull request #79 from square/jwilson/tls_modes

Turn  makeTlsTolerant into two methods.