Merge "libmediaextractor: add manufacurer key in Metadata"