Fixing build script

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

Makefile

@@ -23,7 +23,7 @@ $(APK_MK):
 	    prefix="../"; \
 	 fi; \
 	 if [ -z "$$VLC_CONTRIB" ] ; then \
-	    VLC_CONTRIB="../../contrib/build"; \
+	    VLC_CONTRIB="vlc/extras/contrib/build"; \
 	 fi; \
 	 if [ `echo "$$VLC_CONTRIB" | head -c 1` != "/" ] ; then \
 	    vlc_contrib="../$$VLC_CONTRIB"; \

install.sh

@@ -19,10 +19,18 @@ cd extras/contrib && ./bootstrap -t arm-eabi -d android && make
 
 cd ../.. && mkdir -p android && cd android
 
-echo "Bootstraping"
-../bootstrap
+if [ -e configure ]; then
+    echo "Bootstraping"
+    ../bootstrap
+fi;
 
 echo "Configuring"
 sh ../extras/package/android/configure.sh
 
+echo "Building"
 make
+
+echo "Building Android"
+cd ../../
+make distclean
+VLC_BUILD_DIR=vlc/android make