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

* commit '008a22f9b9588ff3df3e0605970f3cf39442df96':
  Update uchar.h from bionic.