Remove android/arm64 patch as it landed upstream.

docker/base/Dockerfile

@@ -131,6 +131,3 @@ ENV BUILD /build.sh
 RUN chmod +x $BUILD
 
 ENTRYPOINT ["/build.sh"]
-
-# Temporary injects to fix possible Go bugs
-ADD android_arm64.patch /android_arm64.patch

docker/base/android_arm64.patch

@@ -1,40 +0,0 @@
-From 254e42a0d1fc8f7281403218fde7252079b4310f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
-Date: Sun, 13 Dec 2015 21:04:06 +0200
-Subject: [PATCH] runtime: init argc/argv for android/arm64 c-shared
-
-Analogous to https://go-review.googlesource.com/#/c/8457/ this
-code synthesizes an set of program arguments for Android on the
-arm64 architecture.
-
-Change-Id: I851958b4b0944ec79d7a1426a3bb2cfc31746797
----
- src/runtime/rt0_android_arm64.s | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/runtime/rt0_android_arm64.s b/src/runtime/rt0_android_arm64.s
-index 7291476..582fc5a 100644
---- a/src/runtime/rt0_android_arm64.s
-+++ b/src/runtime/rt0_android_arm64.s
-@@ -8,6 +8,18 @@ TEXT _rt0_arm64_android(SB),NOSPLIT,$-8
- 	MOVD	$_rt0_arm64_linux(SB), R4
- 	B	(R4)
- 
-+// When building with -buildmode=c-shared, this symbol is called when the shared
-+// library is loaded.
- TEXT _rt0_arm64_android_lib(SB),NOSPLIT,$-8
-+	MOVW	$1, R0                            // argc
-+	MOVD	$_rt0_arm64_android_argv(SB), R1  // **argv
- 	MOVD	$_rt0_arm64_linux_lib(SB), R4
- 	B	(R4)
-+
-+DATA _rt0_arm64_android_argv+0x00(SB)/8,$_rt0_arm64_android_argv0(SB)
-+DATA _rt0_arm64_android_argv+0x08(SB)/8,$0
-+DATA _rt0_arm64_android_argv+0x10(SB)/8,$0
-+GLOBL _rt0_arm64_android_argv(SB),NOPTR,$0x18
-+
-+DATA _rt0_arm64_android_argv0(SB)/8, $"gojni"
-+GLOBL _rt0_arm64_android_argv0(SB),RODATA,$8
--- 
-2.5.0
-

docker/base/bootstrap_repo.sh

@@ -27,7 +27,6 @@ mv $GOROOT $GOROOT_BOOTSTRAP
 # Download, build and install the requesed Go sources
 (cd /usr/local && git clone https://go.googlesource.com/go)
 (cd $GOROOT && git checkout $1)
-(cd $GOROOT && if [ "$1" == "master" ]; then git apply /android_arm64.patch; fi)
 (cd $GOROOT/src && ./make.bash)
 
 rm -rf $GOROOT_BOOTSTRAP