Merge "rename some files related to MediaPlayer2."