Merge "Don't use cutils/Atomic.h" am: 853996e7b2 am: 072aaa2e39
am: db95974090

Change-Id: I7f930bda6e51c0d4368747f8e4a0eac92e68b2fd