contrib: move some android complexity outside of vlc.git

contrib/bootstrap

@@ -221,15 +221,12 @@ case "${OS}" in
 		add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
 		case "${HOST}" in
 			*arm*)
-			add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
 			add_make "PLATFORM_SHORT_ARCH := arm"
 			;;
 			*i686*)
-			add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
 			add_make "PLATFORM_SHORT_ARCH := x86"
 			;;
 			*mipsel*)
-			add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
 			add_make "PLATFORM_SHORT_ARCH := mips"
 			;;
 		esac

contrib/src/main.mak

@@ -102,8 +102,6 @@ endif
 ifdef HAVE_ANDROID
 CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
 CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
-EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
-EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include
 endif
 
 ifdef HAVE_MACOSX