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

Change-Id: I9ecce4812e461cb4b68371be484b7304c7d54ee1