Merge "Don't use cutils/Atomic.h" am: 07735797a2
am: a272d540d8

Change-Id: Ie442c255e43f2ebe80ef5423aa4508930d72c44c