Merge "MediaPlayer2: change getVideoWidth and getVideoHeight to getVideoSize"