Merge "Guard include of uchar.h in stdatomic.h"