Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp * commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8': Add windows media support check in MediaMetadataRetrieverTest
Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp * commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8': Add windows media support check in MediaMetadataRetrieverTest