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

* commit 'd59b8ed3dbee9374bf1d006624c6a524ca72a528':
  Update uchar.h from bionic.