am 2894204d: am 5aad083f: Merge "PTHREAD_KEYS_MAX cleanup."

* commit '2894204db465b02a0d3d90aef733dabea5888d81':
  PTHREAD_KEYS_MAX cleanup.