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

Change-Id: Ie56fadea498f35c7e820f9fadac1b64697565a78