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

Change-Id: Ia2459d8a1f8fa7ad9df85b7b8520afc04a6486db