Preserve system PATH entries in workspace scripts

Author: shai-almog

scripts/build-android-port.sh

@@ -29,6 +29,12 @@ load_environment() {
   sed 's/^/[build-android-port] ENV: /' "$ENV_FILE"
   # shellcheck disable=SC1090
   source "$ENV_FILE"
+
+  # Ensure common system binaries remain reachable even if the sourced
+  # environment overrides PATH.
+  if ! command -v xvfb-run >/dev/null 2>&1; then
+    export PATH="$PATH:/usr/bin:/bin:/usr/local/bin"
+  fi
 }
 
 check_java_home() {

scripts/setup-workspace.sh

@@ -161,7 +161,7 @@ cat > "$ENV_FILE" <<ENV
 export JAVA_HOME="$JAVA_HOME"
 export JAVA17_HOME="$JAVA17_HOME"
 export MAVEN_HOME="$MAVEN_HOME"
-export PATH="\$JAVA_HOME/bin:\$MAVEN_HOME/bin\${PATH:+:\$PATH}"
+export PATH="\$JAVA_HOME/bin:\$MAVEN_HOME/bin:/usr/bin:/bin:/usr/local/bin\${PATH:+:\$PATH}"
 ENV
 
 log "Workspace environment file metadata"