am ff9b7aa6: Merge "Make ctype.h a little less unhygienic."

* commit 'ff9b7aa695bd4860c0551b8899f2f26311174855':
  Make ctype.h a little less unhygienic.