ci-dockerfiles-deployment: Update from upstream

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I0c0cd5ef80f6eb26a2f30b29db10c72f6848b562
diff --git a/ci-dockerfiles-deployment/builders.sh b/ci-dockerfiles-deployment/builders.sh
index c21bc22..3e67839 100644
--- a/ci-dockerfiles-deployment/builders.sh
+++ b/ci-dockerfiles-deployment/builders.sh
@@ -21,14 +21,17 @@
 fi
 
 # For dpkg-architecture call below
-sudo apt-get -y -qq install --no-install-recommends dpkg-dev
+if ! type dpkg-architecture
+then
+    sudo apt-get -y -qq install --no-install-recommends dpkg-dev
+fi
 
 if ! type aws
 then
     sudo apt-get -y -qq update
     sudo apt-get -y -qq install --no-install-recommends unzip
     curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-    unzip awscliv2.zip
+    unzip -q awscliv2.zip
     sudo ./aws/install
 fi