merge from open-source master

Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4

diff --cc media/libmediaplayerservice/MediaPlayerService.cpp
index 3e1f4a5,49032e7..6a6afa1
--- 1/media/libmediaplayerservice/MediaPlayerService.cpp
--- 2/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@@ -758,13 -682,8 +758,13 @@@ player_type getPlayerType(const char* u
          int len = strlen(FILE_EXTS[i].extension);
          int start = lenURL - len;
          if (start > 0) {
-             if (!strncmp(url + start, FILE_EXTS[i].extension, len)) {
+             if (!strncasecmp(url + start, FILE_EXTS[i].extension, len)) {
 -                return FILE_EXTS[i].playertype;
 +                if (FILE_EXTS[i].playertype == VORBIS_PLAYER
 +                    && !strncasecmp(url, "http://", 7)
 +                    && useStagefrightForHTTP) {
 +                    return STAGEFRIGHT_PLAYER;
 +                }
 +                return OverrideStagefrightForVorbis(FILE_EXTS[i].playertype);
              }
          }
      }