Merge changes I668f5351,I40fa767b

* changes:
  Revert^2 "Move GCStress BacktraceHelper to libbacktrace"
  Rewrite thread CustomTLS to support keyed TLS entries