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

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