Merge "MediaPlayer2: clean up part of code"