Merge "Make arm-linux-androideabi toolchain the default for Android build."