Merge "Make MetadataBufferType.h C-friendly"