Merge change Ib0036762 into eclair

* changes:
  Add windows media support check in MediaMetadataRetrieverTest bug 2232274