Merge "Don't use cutils/Atomic.h" am: 28bbf9b63a am: 7270dc01ca
am: e3ccf5c0e6

Change-Id: I742e0b5414b598e9ded5ca4920b6b550ebbf831e