am 1cf85515: Merge "Revert "ART: Use bionic TLS slot for thread-self""

* commit '1cf85515600d298a2c9e4de137c0926949205097':
  Revert "ART: Use bionic TLS slot for thread-self"