Merge "VideoView2Impl: add Context for MediaPlayer2Impl ctor"