Turn  makeTlsTolerant into two methods.

See https://android-review.googlesource.com/48700