Merge "stagefright: MetadataRetriever API to specify mime and color format" into oc-mr1-dev