am b53af3f6: am 4b9f899b: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit 'b53af3f60f3d6a9b1557f2891183c3322ec3aa14':