Merge "Add header that declares atomic primitives"