Merge "Add header that declares atomic primitives"
am: 76e0179218

Change-Id: I1f3f883354c06c90d9cbf7a7aa2c59526d4e9dcc