Merge "Don't use cutils/Atomic.h" am: 853996e7b2
am: 072aaa2e39

Change-Id: I3502ec89eed45da2d052fb274d08fcb7c1c62f1b