Merge "<cutils/atomic.h> has been inlined for two years now."