Improve support for building for Android devices

The Android NDK is rather finicky, so handle it specially. The most important
part here is using --sysroot for CFLAGS and LDFLAGS.
diff --git a/COMPILE.TXT b/COMPILE.TXT
index 6d28a07..6c7f948 100644
--- a/COMPILE.TXT
+++ b/COMPILE.TXT
@@ -137,8 +137,11 @@
 (5) Cross-compile for Android
 
   To cross-compile for Android (smartphone/tablet), Android NDK is required.
+  NOTE: Only ARM and ARM64 are currently supported.
 
-	$ ./make.sh cross-android
+       $ NDK=/android/android-ndk-r10e ./make.sh cross-android arm
+       or
+       $ NDK=/android/android-ndk-r10e ./make.sh cross-android arm64
 
   Resulted files libcapstone.so, libcapstone.a & tests/test* can then
   be used on Android devices.
diff --git a/make.sh b/make.sh
index 704c55f..9ff9217 100755
--- a/make.sh
+++ b/make.sh
@@ -22,12 +22,50 @@
 	CC="$IOS_CC" CFLAGS="$IOS_CFLAGS" LDFLAGS="$IOS_LDFLAGS" LIBARCHS="$IOS_ARCHS" ${MAKE}
 }
 
+# build Android lib for only one supported architecture
+function build_android {
+    if [ -z "$NDK" ]; then
+        echo "ERROR! Please set \$NDK to point at your Android NDK directory."
+        exit 1
+    fi
+    HOSTOS=$(uname -s | tr 'LD' 'ld')
+    HOSTARCH=$(uname -m)
+
+    TARGARCH="$1"
+    shift
+
+    case "$TARGARCH" in
+      arm)
+          [ -n "$APILEVEL" ] || APILEVEL="android-14"  # default to ICS
+          [ -n "$GCCVER" ] || GCCVER="4.8"
+          CROSS=arm-linux-androideabi-
+          ;;
+      arm64)
+          [ -n "$APILEVEL" ] || APILEVEL="android-21"  # first with arm64
+          [ -n "$GCCVER" ] || GCCVER="4.9"
+          CROSS=aarch64-linux-android-
+          ;;
+
+      *)
+          echo "ERROR! Building for Android on $1 is not currently supported."
+          exit 1
+          ;;
+    esac
+
+    TOOLCHAIN="$NDK/toolchains/$CROSS$GCCVER/prebuilt/$HOSTOS-$HOSTARCH"
+    PLATFORM="$NDK/platforms/$APILEVEL/arch-$TARGARCH"
+
+	${MAKE} clean
+
+    CROSS="$TOOLCHAIN/bin/$CROSS" CFLAGS="--sysroot=$PLATFORM" LDFLAGS="--sysroot=$PLATFORM" ${MAKE} $*
+}
+
+
 function build {
 	if [ $(uname -s) = Darwin ]; then
 		export LIBARCHS="i386 x86_64"
 	fi
 
-	${MAKE} clean
 
 	if [ ${CC}x != x ]; then
 		${MAKE} CC=$CC $*
@@ -123,8 +161,7 @@
   "cross-win64" ) CROSS=x86_64-w64-mingw32- build $*;;
   "cygwin-mingw32" ) CROSS=i686-pc-mingw32- build $*;;
   "cygwin-mingw64" ) CROSS=x86_64-w64-mingw32- build $*;;
-  "cross-android" ) CROSS=arm-linux-androideabi- build $*;;
-  "cross-android64" ) CROSS=aarch64-linux-gnu- build $*;;
+  "cross-android" ) build_android $*;;
   "clang" ) CC=clang build $*;;
   "gcc" ) CC=gcc build $*;;
   "ios" ) build_iOS $*;;