Stop special handling of gnome-icon-theme

At one point we were getting corrupted versions from some debian
mirrors, but as far as I can tell all mirrors are now serving correct
versions. There should be no more reason to get errors here then for
any other deb package.

BUG=none
TEST=kokoro

Change-Id: If149ae68b056acf83a7e7454e94886a0c1c1b751
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/containers/cros-container-guest-tools/+/3041208
Reviewed-by: David Munro <davidmunro@google.com>
Tested-by: David Munro <davidmunro@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Fergus Dall <sidereal@google.com>
diff --git a/kokoro/lxd_container.sh b/kokoro/lxd_container.sh
index c2180be..81c9c46 100755
--- a/kokoro/lxd_container.sh
+++ b/kokoro/lxd_container.sh
@@ -36,11 +36,6 @@
         sudo dpkg --install "${KOKORO_GFILE_DIR}"/qemu-user-static.deb
     fi
 
-    # gnome-icon-theme_3.12.0-2 sometimes gets checksum failures when installing
-    # from deb.debian.org, use our own known-good copy.
-    mkdir -p /tmp/extra-debs
-    cp "${KOKORO_GFILE_DIR}/gnome-icon-theme_3.12.0-2_all.deb" /tmp/extra-debs
-
     # pixz improves compression time for the rootfs significantly.
     sudo apt-get install -q -y pixz
 
diff --git a/lxd/build_debian_container.sh b/lxd/build_debian_container.sh
index 846e0cd..8545e27 100755
--- a/lxd/build_debian_container.sh
+++ b/lxd/build_debian_container.sh
@@ -49,8 +49,6 @@
     mkdir -p "${rootfs}/opt/google/cros-containers"
     mount --bind /tmp/cros-containers "${rootfs}/opt/google/cros-containers"
     mount --bind /run/resolvconf/resolv.conf "${rootfs}/etc/resolv.conf"
-    mkdir -p "${rootfs}/extra-debs"
-    mount --bind /tmp/extra-debs "${rootfs}/extra-debs"
     mount --bind /dev "${rootfs}/dev"
     mount -t proc none "${rootfs}/proc"
     mount -t tmpfs tmpfs "${rootfs}/run"
@@ -84,8 +82,6 @@
     umount "${rootfs}/run"
     umount "${rootfs}/proc"
     umount "${rootfs}/dev"
-    umount "${rootfs}/extra-debs"
-    rm -rf "${rootfs}/extra-debs"
     umount "${rootfs}/etc/resolv.conf"
     umount "${rootfs}/opt/google/cros-containers"
     rm -rf "${rootfs}/opt/google"
diff --git a/lxd/lxd_setup.sh b/lxd/lxd_setup.sh
index dcb1312..b42f236 100755
--- a/lxd/lxd_setup.sh
+++ b/lxd/lxd_setup.sh
@@ -22,25 +22,6 @@
     # python3 is used for integration testing.
     apt-get -q -y --no-install-recommends install python3
     if [ "${release}" = "stretch" ]; then
-        # gnome-icon-theme_3.12.0-2 sometimes gets checksum failures when
-        # installing from deb.debian.org, use our own known-good copy, with
-        # lots of extra debugging so we can try and figure out the cause,
-        # and retry up to 5 times to try and keep the build going.
-        # Buster has a newer version we haven't seen failures on, so this will
-        # go away when we can stop supporting Stretch.
-        set +e
-        for attempt in {1..5}; do
-            apt-get -q -y --no-install-recommends -o Debug::Hashes=true \
-                -o Debug::pkgAcquire::Auth=true -o Debug::pkgDPkgPM=true \
-                install /extra-debs/gnome-icon-theme_3.12.0-2_all.deb && break
-        done
-        set -e
-        if [[ "${attempt}" -eq 5 ]]; then
-            # Failed to install, try again without apt and even more verbose.
-            # Like, really verbose, but not quite the most verbose.
-            dpkg -D73333 -i /extra-debs/gnome-icon-theme_3.12.0-2_all.deb
-        fi
-
         # The cros-gpu package installs more apt sources.
         apt-get -q -y --allow-unauthenticated install cros-gpu
         apt-get update