Merge "Fix mesa3d build w/C and __has_cpp_attribute"