Merge "Update uchar.h from bionic."