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

* commit '854e930cc5bfe948745f8abcad04f4d83abe3b91':
  Fix tlsPtr_.long_jump_context == nullptr check failure.