Merge "MediaPlayer2: don't pass cookies to Media2HTTPService"