Merge "MediaPlayer2: remove factory"