Merge "Add comment to discourage use of cutils/atomic.h."