Merge "No need to #include atomic-inline.h if you have atomic.h."