Merge "VideoView2Impl: remove usage of MediaPlayer2Impl"