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

* commit '4c2732779a11c92222958e7150162d4eaaab7b66':
  Re-enable FAST_TLS in gl2 code