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

Change-Id: I8058a2ba6fab55a8c2b00d8dac1a1560ca461282