Build and release i686+aarch64 android binaries

Author: alexcrichton

master/master.cfg

@@ -861,7 +861,9 @@ class ConfigCommand(object):
 
         # Set up the path to the android NDK
         if testing_android:
-            s += " --android-cross-path=/android/ndk-arm-18"
+            s += " --arm-linux-androideabi-ndk=/android/ndk-arm-18"
+            s += " --i686-linux-android-ndk=/android/ndk-x86"
+            s += " --aarch64-linux-android-ndk=/android/ndk-aarch64"
             s += " --disable-docs"
 
         if "release-channel" in props:
@@ -1709,6 +1711,7 @@ for p in auto_platforms:
     android = False
     if "-x-android" in p:
         targets.append('arm-linux-androideabi')
+        targets.append('i686-linux-android')
         android = True
         # Not checking android for now
         chk = False
@@ -1766,6 +1769,7 @@ for p in dist_platforms:
         # Not checking android for now
         hosts = []
         targets.append('arm-linux-androideabi')
+        targets.append('i686-linux-android')
     elif "musl" in p:
         musl = "/musl-x86_64"
         hosts = []