am 76370140: am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair

Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'

* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
  Add windows media support check in MediaMetadataRetrieverTest