Merge "Update uchar.h from bionic." am: 008a22f9b9
am: 7d7f8702f3

* commit '7d7f8702f3f99670274ec4bf8f18a717e2acc0d5':
  Update uchar.h from bionic.