Merge "Don't use cutils/Atomic.h" am: 9355446812
am: 6867db2980

Change-Id: Ia55205f8373e5a27e915f30a4501e1808b351195