am c2f31ef2: am dba6bd45: am ca7a7b05: Merge "opengles emulator: use bionic tls slot"

* commit 'c2f31ef27b778e77e71a918276f6f6cad0e7d071':
  opengles emulator: use bionic tls slot