Merge "Fix warnings in cutils/atomic.h"
am: 5e093f367c

Change-Id: I32d4a5cae0e61ac7ae30e0bd9b1b81e409009fd0