Merge "MediaPlayer2Test: replace VideoSize with Size"