Merge "Fix warnings in cutils/atomic.h"