Merge "Fix, generalize stdatomic.h; improve test."