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

Change-Id: I7b534644fac1852b37845956da1b13c8bdc86976