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

Change-Id: I64109800186f687ebfca5eb3c5aed6885d30f08a