Merge "media: refine kMetadataBufferTypes" into mnc-dev