Merge "Add header that declares atomic primitives" am: 76e0179218 am: 59c7642774
am: 78aef2873d

Change-Id: I9ecce4812e461cb4b68371be484b7304c7d54ee1