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

Change-Id: Ib568aec2f8f93718da374ffce4303d1d9b6cf40b