Merge "MediaPlayer2: initial code for playlist support"