Merge "Don't use cutils/Atomic.h" am: 8f4529bbc2 am: 410582488d
am: afbe4eee71

Change-Id: I4df09b7dc90a191a222b7e9a1d5ff3be3dc9bb67