Merge "VideoView2Impl: corresponding change for DataSourceDesc"