am da7cbd8c: Merge "media: refine kMetadataBufferTypes" into mnc-dev

* commit 'da7cbd8c7c54c2c93ca7bc49b5218cf99825f9e4':
  media: refine kMetadataBufferTypes