Fix build with modern {N|S}DK; Increase audiobuffer size

diff --git a/android/android.make b/android/android.make
index 6f7cb8a..aa86300 100644
--- a/android/android.make
+++ b/android/android.make
@@ -32,10 +32,10 @@ ANDROID_PLATFORM_VERSION=19
 ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION)

 # android tools
-BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*)))
+BUILD_TOOLS_VERSION=19.1.0
 AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt
 DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx
-ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
+ZIPALIGN=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/zipalign
 KEYSTORE=$(HOME)/.android/debug.keystore
 ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
 BUILDAPK=$(ANDROID_DIR)/buildapk.sh
diff --git a/tools/configure b/tools/configure
index ec83502..17c3a31 100755
--- a/tools/configure
+++ b/tools/configure
@@ -676,7 +676,7 @@ androidcc () {
     fi
     SHARED_LDFLAG="-shared"
     SHARED_CFLAGS=''
-    GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
+    GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack,-fuse-ld=bfd"
     ANDROID_ARCH=$1 # for android.make too
     gccchoice="4.6"
     # arch dependant stuff
@@ -688,8 +688,8 @@ androidcc () {
             # threads work fine so far
             thread_support="ASSEMBLER_THREADS"
             GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
-                    --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm"
-            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm"
+                    --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-arm"
+            LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-arm"
             ;;
         mips)
             endian="little"
@@ -3435,7 +3435,27 @@ fi
     sharedir="/data/data/org.rockbox/app_rockbox/rockbox"
     bindir="/data/data/org.rockbox/lib"
     libdir="/data/data/org.rockbox/app_rockbox"
-    memory=8
+    if [ "$lcd_orientation" != "landscape" ] ; then
+        if [ $ARG_LCDWIDTH -gt "720" ]; then
+            memory=64
+        else
+            if [ $ARG_LCDWIDTH -gt "540" ]; then
+                memory=32
+            else
+                memory=16
+            fi
+        fi
+    else
+        if [ $ARG_LCDHEIGHT -gt "720" ]; then
+            memory=64
+        else
+            if [ $ARG_LCDHEIGHT -gt "540" ]; then
+                memory=32
+            else
+                memory=16
+            fi
+        fi
+    fi
     uname=`uname`
     androidcc armeabi
     tool="cp "