Merge branch 'dev_wangzhuan_meirixiaoduanju_0927' of http://gitlab.mints-id.com/android/android_vedio into dev_wangzhuan_meirixiaoduanju_0927