No need for setup-go-bootstrap anymore on host side

common.xml

@@ -575,7 +575,6 @@ chroot mnt localedef -i en_GB -f UTF-8 en_GB.UTF-8
   <antcall target="make-secondary"/>
   <antcall target="mount-secondary"/>
   <antcall target="fill-secondary"/>
-  <antcall target="setup-go-bootstrap"/>
   <antcall target="unmount"/>
   <antcall target="run-system-with-secondary-${BOARD}"/>
   <antcall target="check-build-success"/>
@@ -674,13 +673,6 @@ rm /lib/systemd/system/build
   <chmod file="${sysdir}/lib/systemd/system/build" perm="755"/>
  </target>
 
- <target name="setup-go-bootstrap" if="GO_BOOTSTRAP">
-  <ant antfile="packages/go/build.xml" target="go-bootstrap"/>
-  <exec executable="mv" failonerror="true">
-   <arg line="-v ${builddir}/go-linux-${GOARCH}-bootstrap.tbz ${sysdir}/packages/go"/>
-  </exec>
- </target>
-
  <target name="build-image-www">
   <fail unless="BOARD" message="Correct machine type must be specified"/>
   <antcall target="mount"/>

mender.xml

@@ -24,7 +24,7 @@
   <exec executable="./make.bash" dir="${makedir}/src"/>
   <move file="${builddir}/go" tofile="${builddir}/go1.4"/>
   <exec executable="tar" failonerror="true">
-   <arg line="xf ${basedir}/build-system/packages/go/go1.14.4.src.tar.gz -C ${builddir}"/>
+   <arg line="xf ${basedir}/build-system/packages/go/go1.16.5.src.tar.gz -C ${builddir}"/>
   </exec>
   <exec executable="./make.bash" dir="${makedir}/src">
    <env key="GOROOT_BOOTSTRAP" path="${builddir}/go1.4"/>
@@ -42,9 +42,6 @@
   <exec executable="mv" dir="${builddir}" failonerror="true">
    <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-3.5.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
   </exec>
-  <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
-   <arg line="mod init"/>
-  </exec>
   <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
    <arg line="mod vendor"/>
   </exec>

go @ bb21149a

-Subproject commit 9e2e55a6951b01e08b6d5638803ba2e9c16334d6
+Subproject commit bb21149ad25ca46ec8a10fcb1c4fbf330a6be5a6