am 3d6aa50a: am f888d5d6: Merge "Fix tlsPtr_.long_jump_context == nullptr check failure."

* commit '3d6aa50a88a18574d4e5efb50829164e5599c1af':
  Fix tlsPtr_.long_jump_context == nullptr check failure.