Merge "Don't use cutils/Atomic.h" am: 28bbf9b63a
am: 7270dc01ca

Change-Id: Ia7e4376604919d925de34942395967cf9a2bb770