Merge "Ensure header files using __BEGIN_DECLS include sys/cdefs.h."