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