Merge "Add header that declares atomic primitives" am: 3e59c847cc
am: cb0bd19b35

Change-Id: I1364afe021bea9306a0e401a009c2fe16ac3c04a