am 5aad083f: Merge "PTHREAD_KEYS_MAX cleanup."

* commit '5aad083f3de0bbcc0ffb1fecb688fbbe5abe5214':
  PTHREAD_KEYS_MAX cleanup.