am bba6bb81: am 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev

* commit 'bba6bb81373b285b456bb851d37f7f2ecfc742ad':
  Re-enable FAST_TLS in gl2 code