[Install-build-deps] Restore workaround for ARM package dependency issue

I'm not able to repro the issue, but the workaround removal was causing
the Jammy and Focal image builders to fail [1].

[1] https://ci.chromium.org/p/infra-internal/g/infra-internal-images/console

R=thestig

Change-Id: I67a2d1fd105c96e09bed4de9c06c6dd9c2eb90ea
Bug: 40549424
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5661566
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1320125}

diff --git a/build/install-build-deps.py b/build/install-build-deps.py
index 680c7c6..35f7c2f 100755
--- a/build/install-build-deps.py
+++ b/build/install-build-deps.py

@@ -628,6 +628,20 @@
       "linux-libc-dev-armhf-cross",
   ]
 
+  # Work around an Ubuntu dependency issue.
+  # TODO(https://crbug.com/40549424): Remove this when support for Focal
+  # and Jammy are dropped.
+  if distro_codename() == "focal":
+    packages.extend([
+        "g++-10-multilib-arm-linux-gnueabihf",
+        "gcc-10-multilib-arm-linux-gnueabihf",
+    ])
+  elif distro_codename() == "jammy":
+    packages.extend([
+        "g++-11-arm-linux-gnueabihf",
+        "gcc-11-arm-linux-gnueabihf",
+    ])
+
   return packages