am 23b29b83: (-s ours) am f291c682: BoringSSL: Fix session resumption

* commit '23b29b831766c2aa81341ec74c6dc9086f7a73d1':