Merge "Remove unused MediaPlayer methods"