update for vlc
Merge branch 'master' of github.com:371816210/vlc_android

Conflicts:
	build_env.sh
update for .gitignore