Re-spin Gfxstream prebuilts to include graphics detector

Generated with:
   ./device/google/cuttlefish_vmm/rebuild.sh \
       --docker \
       --docker_arch aarch64

   ./device/google/cuttlefish_vmm/rebuild.sh \
       --docker \
       --docker_arch x86_64

   ./device/google/cuttlefish_vmm/gen_android_bp.sh

Bug: b/297563172
Test: m
Change-Id: Ia57fc30cf4ba0b12668ae2dc21450525401ad832
diff --git a/Android.bp b/Android.bp
index fb61904..9930817 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,14 @@
   check_elf_files: false,
 }
 cc_prebuilt_binary {
+  name: "aarch64_linux_gnu_gfxstream_graphics_detector_for_crosvm",
+  srcs: ["aarch64-linux-gnu/bin/gfxstream_graphics_detector"],
+  stem: "gfxstream_graphics_detector",
+  relative_install_path: "aarch64-linux-gnu",
+  defaults: ["cuttlefish_host"],
+  check_elf_files: false,
+}
+cc_prebuilt_binary {
   name: "aarch64_linux_gnu_libdrm.so.2_for_crosvm",
   srcs: ["aarch64-linux-gnu/bin/libdrm.so.2"],
   stem: "libdrm.so.2",
@@ -102,6 +110,14 @@
 //   check_elf_files: false,
 // }
 cc_prebuilt_binary {
+  name: "x86_64_linux_gnu_gfxstream_graphics_detector_for_crosvm",
+  srcs: ["x86_64-linux-gnu/bin/gfxstream_graphics_detector"],
+  stem: "gfxstream_graphics_detector",
+  relative_install_path: "x86_64-linux-gnu",
+  defaults: ["cuttlefish_host"],
+  check_elf_files: false,
+}
+cc_prebuilt_binary {
   name: "x86_64_linux_gnu_libdrm.so.2_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libdrm.so.2"],
   stem: "libdrm.so.2",
diff --git a/aarch64-linux-gnu/Cargo.lock b/aarch64-linux-gnu/Cargo.lock
index 12ef722..02884d7 100644
--- a/aarch64-linux-gnu/Cargo.lock
+++ b/aarch64-linux-gnu/Cargo.lock
@@ -126,7 +126,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.33",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.33",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -291,7 +291,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.33",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2014,9 +2014,9 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -2380,7 +2380,7 @@
  "argh",
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.33",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2465,9 +2465,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.33"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
@@ -3066,7 +3066,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.33",
+ "syn 2.0.39",
 ]
 
 [[package]]
diff --git a/aarch64-linux-gnu/bin/crosvm b/aarch64-linux-gnu/bin/crosvm
index 82d2901..e35f4d4 100755
--- a/aarch64-linux-gnu/bin/crosvm
+++ b/aarch64-linux-gnu/bin/crosvm
Binary files differ
diff --git a/aarch64-linux-gnu/bin/crosvm.debug b/aarch64-linux-gnu/bin/crosvm.debug
index 9dd4039..9fbf53c 100755
--- a/aarch64-linux-gnu/bin/crosvm.debug
+++ b/aarch64-linux-gnu/bin/crosvm.debug
Binary files differ
diff --git a/aarch64-linux-gnu/bin/gfxstream_graphics_detector b/aarch64-linux-gnu/bin/gfxstream_graphics_detector
new file mode 100755
index 0000000..168c045
--- /dev/null
+++ b/aarch64-linux-gnu/bin/gfxstream_graphics_detector
Binary files differ
diff --git a/aarch64-linux-gnu/bin/gfxstream_graphics_detector.debug b/aarch64-linux-gnu/bin/gfxstream_graphics_detector.debug
new file mode 100755
index 0000000..ddd246f
--- /dev/null
+++ b/aarch64-linux-gnu/bin/gfxstream_graphics_detector.debug
Binary files differ
diff --git a/aarch64-linux-gnu/bin/libgfxstream_backend.so b/aarch64-linux-gnu/bin/libgfxstream_backend.so
index f2cd5ca..6484027 100755
--- a/aarch64-linux-gnu/bin/libgfxstream_backend.so
+++ b/aarch64-linux-gnu/bin/libgfxstream_backend.so
Binary files differ
diff --git a/aarch64-linux-gnu/bin/libgfxstream_backend.so.debug b/aarch64-linux-gnu/bin/libgfxstream_backend.so.debug
index 0544590..428792c 100755
--- a/aarch64-linux-gnu/bin/libgfxstream_backend.so.debug
+++ b/aarch64-linux-gnu/bin/libgfxstream_backend.so.debug
Binary files differ
diff --git a/aarch64-linux-gnu/builder-packages.txt b/aarch64-linux-gnu/builder-packages.txt
index d702bd5..64489fe 100644
--- a/aarch64-linux-gnu/builder-packages.txt
+++ b/aarch64-linux-gnu/builder-packages.txt
@@ -16,18 +16,18 @@
 coreutils	8.30-3
 cpp	4:8.3.0-1
 cpp-8	8.3.0-6
-curl	7.64.0-4+deb10u6
+curl	7.64.0-4+deb10u7
 dash	0.5.10.2-5
 dblatex	0.3.10-2
 dblatex-doc	0.3.10-2
-dbus	1.12.24-0+deb10u1
+dbus	1.12.28-0+deb10u1
 debconf	1.5.71+deb10u1
 debian-archive-keyring	2019.1+deb10u2
 debianutils	4.8.6.1
 dh-python	3.20190308
 diffutils	1:3.7-3
 dirmngr	2.2.12-1+deb10u2
-distro-info-data	0.41+deb10u7
+distro-info-data	0.41+deb10u8
 docbook-xml	4.5-8
 docbook-xsl	1.79.1+dfsg-2
 doxygen	1.8.13-10
@@ -54,7 +54,7 @@
 gcc	4:8.3.0-1
 gcc-8	8.3.0-6
 gcc-8-base:arm64	8.3.0-6
-ghostscript	9.27~dfsg-2+deb10u8
+ghostscript	9.27~dfsg-2+deb10u9
 gir1.2-glib-2.0:arm64	1.58.3-2
 git	1:2.20.1-2+deb10u8
 git-man	1:2.20.1-2+deb10u8
@@ -77,7 +77,7 @@
 init-system-helpers	1.56+nmu1
 iso-codes	4.2-1
 javascript-common	11
-krb5-locales	1.17-3+deb10u5
+krb5-locales	1.17-3+deb10u6
 less	487-0.1+b1
 libacl1:arm64	2.2.53-4
 libalgorithm-c3-perl	0.10-1
@@ -122,16 +122,16 @@
 libclass-method-modifiers-perl	2.12-1
 libclass-xsaccessor-perl	1.19-3+b2
 libcom-err2:arm64	1.44.5-1+deb10u3
-libcups2:arm64	2.2.10-6+deb10u8
+libcups2:arm64	2.2.10-6+deb10u9
 libcupsfilters1:arm64	1.21.6-5+deb10u1
-libcupsimage2:arm64	2.2.10-6+deb10u8
-libcurl3-gnutls:arm64	7.64.0-4+deb10u6
-libcurl4:arm64	7.64.0-4+deb10u6
+libcupsimage2:arm64	2.2.10-6+deb10u9
+libcurl3-gnutls:arm64	7.64.0-4+deb10u7
+libcurl4:arm64	7.64.0-4+deb10u7
 libdata-dump-perl	1.23-1
 libdata-optlist-perl	0.110-1
 libdatrie1:arm64	0.2.12-2
 libdb5.3:arm64	5.3.28+dfsg1-0.5
-libdbus-1-3:arm64	1.12.24-0+deb10u1
+libdbus-1-3:arm64	1.12.28-0+deb10u1
 libdebconfclient0:arm64	0.249
 libdevel-callchecker-perl	0.008-1
 libdevel-caller-perl	2.06-2+b1
@@ -154,7 +154,7 @@
 libegl-mesa0:arm64	18.3.6-2+deb10u1
 libegl1:arm64	1.1.0-1
 libegl1-mesa-dev:arm64	18.3.6-2+deb10u1
-libelf1:arm64	0.176-1.1
+libelf1:arm64	0.176-1.1+deb10u1
 libemail-date-format-perl	1.005-1
 libencode-locale-perl	1.05-1
 liberror-perl	0.17027-2
@@ -195,8 +195,8 @@
 libgles1:arm64	1.1.0-1
 libgles2:arm64	1.1.0-1
 libgles2-mesa-dev:arm64	18.3.6-2+deb10u1
-libglib2.0-0:arm64	2.58.3-2+deb10u4
-libglib2.0-data	2.58.3-2+deb10u4
+libglib2.0-0:arm64	2.58.3-2+deb10u5
+libglib2.0-data	2.58.3-2+deb10u5
 libglvnd-core-dev:arm64	1.1.0-1
 libglvnd-dev:arm64	1.1.0-1
 libglvnd0:arm64	1.1.0-1
@@ -208,9 +208,9 @@
 libgpg-error0:arm64	1.35-1
 libgpm2:arm64	1.20.7-5
 libgraphite2-3:arm64	1.3.13-7
-libgs9:arm64	9.27~dfsg-2+deb10u8
-libgs9-common	9.27~dfsg-2+deb10u8
-libgssapi-krb5-2:arm64	1.17-3+deb10u5
+libgs9:arm64	9.27~dfsg-2+deb10u9
+libgs9-common	9.27~dfsg-2+deb10u9
+libgssapi-krb5-2:arm64	1.17-3+deb10u6
 libgts-0.7-5:arm64	0.7.6+darcs121130-4
 libgts-bin	0.7.6+darcs121130-4
 libgvc6	2.40.1-6+deb10u1
@@ -245,11 +245,11 @@
 libjbig2dec0:arm64	0.16-1+deb10u1
 libjpeg62-turbo:arm64	1:1.5.2-2+deb10u1
 libjs-jquery	3.3.1~dfsg-3+deb10u1
-libk5crypto3:arm64	1.17-3+deb10u5
+libk5crypto3:arm64	1.17-3+deb10u6
 libkeyutils1:arm64	1.6-6
 libkpathsea6:arm64	2018.20181218.49446-1+deb10u2
-libkrb5-3:arm64	1.17-3+deb10u5
-libkrb5support0:arm64	1.17-3+deb10u5
+libkrb5-3:arm64	1.17-3+deb10u6
+libkrb5support0:arm64	1.17-3+deb10u6
 libksba8:arm64	1.3.5-2+deb10u2
 liblab-gamut1	2.40.1-6+deb10u1
 liblcms2-2:arm64	2.9-3
@@ -283,14 +283,14 @@
 libmro-compat-perl	0.13-1
 libnamespace-autoclean-perl	0.28-1
 libnamespace-clean-perl	0.27-1
-libncurses6:arm64	6.1+20181013-2+deb10u3
-libncursesw6:arm64	6.1+20181013-2+deb10u3
+libncurses6:arm64	6.1+20181013-2+deb10u4
+libncursesw6:arm64	6.1+20181013-2+deb10u4
 libnet-dbus-perl	1.1.0-5+b1
 libnet-http-perl	6.18-1
 libnet-smtp-ssl-perl	1.04-1
 libnet-ssleay-perl	1.85-2+deb10u1
 libnettle6:arm64	3.4.1-1+deb10u1
-libnghttp2-14:arm64	1.36.0-2+deb10u1
+libnghttp2-14:arm64	1.36.0-2+deb10u2
 libnpth0:arm64	1.6-1
 libopengl0:arm64	1.1.0-1
 libopenjp2-7:arm64	2.3.0-2+deb10u2
@@ -328,14 +328,14 @@
 libpthread-stubs0-dev:arm64	0.4-1
 libpython-stdlib:arm64	2.7.16-1
 libpython2-stdlib:arm64	2.7.16-1
-libpython2.7-minimal:arm64	2.7.16-2+deb10u2
-libpython2.7-stdlib:arm64	2.7.16-2+deb10u2
+libpython2.7-minimal:arm64	2.7.16-2+deb10u3
+libpython2.7-stdlib:arm64	2.7.16-2+deb10u3
 libpython3-dev:arm64	3.7.3-1
 libpython3-stdlib:arm64	3.7.3-1
-libpython3.7:arm64	3.7.3-2+deb10u5
-libpython3.7-dev:arm64	3.7.3-2+deb10u5
-libpython3.7-minimal:arm64	3.7.3-2+deb10u5
-libpython3.7-stdlib:arm64	3.7.3-2+deb10u5
+libpython3.7:arm64	3.7.3-2+deb10u6
+libpython3.7-dev:arm64	3.7.3-2+deb10u6
+libpython3.7-minimal:arm64	3.7.3-2+deb10u6
+libpython3.7-stdlib:arm64	3.7.3-2+deb10u6
 libreadline7:arm64	7.0-5
 libreadonly-perl	2.050-1
 libref-util-perl	0.204-1
@@ -386,7 +386,7 @@
 libtie-ixhash-perl	1.23-2
 libtiff5:arm64	4.1.0+git191117-2~deb10u8
 libtimedate-perl	2.3000-2+deb10u1
-libtinfo6:arm64	6.1+20181013-2+deb10u3
+libtinfo6:arm64	6.1+20181013-2+deb10u4
 libtk8.6:arm64	8.6.9-2
 libtool	2.4.6-9
 libtry-tiny-perl	0.30-1
@@ -408,16 +408,16 @@
 libwayland-dev:arm64	1.16.0-1
 libwayland-egl1:arm64	1.16.0-1
 libwayland-server0:arm64	1.16.0-1
-libwebp6:arm64	0.6.1-2+deb10u2
+libwebp6:arm64	0.6.1-2+deb10u3
 libwoff1:arm64	1.0.2-1
 libwww-perl	6.36-2
 libwww-robotrules-perl	6.02-1
-libx11-6:arm64	2:1.6.7-1+deb10u3
-libx11-data	2:1.6.7-1+deb10u3
-libx11-dev:arm64	2:1.6.7-1+deb10u3
+libx11-6:arm64	2:1.6.7-1+deb10u4
+libx11-data	2:1.6.7-1+deb10u4
+libx11-dev:arm64	2:1.6.7-1+deb10u4
 libx11-protocol-perl	0.56-7
-libx11-xcb-dev:arm64	2:1.6.7-1+deb10u3
-libx11-xcb1:arm64	2:1.6.7-1+deb10u3
+libx11-xcb-dev:arm64	2:1.6.7-1+deb10u4
+libx11-xcb1:arm64	2:1.6.7-1+deb10u4
 libxapian30:arm64	1.4.11-1+deb10u1
 libxau-dev:arm64	1:1.0.8-1+b2
 libxau6:arm64	1:1.0.8-1+b2
@@ -470,7 +470,7 @@
 libxml2-utils	2.9.4+dfsg1-7+deb10u6
 libxmu6:arm64	2:1.1.2-2+b3
 libxmuu1:arm64	2:1.1.2-2+b3
-libxpm4:arm64	1:3.5.12-1+deb10u1
+libxpm4:arm64	1:3.5.12-1+deb10u2
 libxrandr2:arm64	2:1.5.1-1
 libxrender1:arm64	1:0.9.10-1
 libxshmfence-dev:arm64	1.3-1
@@ -502,8 +502,8 @@
 mime-support	3.62
 mount	2.33.1-0.1
 nasm	2.14-1
-ncurses-base	6.1+20181013-2+deb10u3
-ncurses-bin	6.1+20181013-2+deb10u3
+ncurses-base	6.1+20181013-2+deb10u4
+ncurses-bin	6.1+20181013-2+deb10u4
 netbase	5.6
 ninja-build	1.8.2-1
 openssh-client	1:7.9p1-10+deb10u3
@@ -527,8 +527,8 @@
 python-pip-whl	18.1-5
 python2	2.7.16-1
 python2-minimal	2.7.16-1
-python2.7	2.7.16-2+deb10u2
-python2.7-minimal	2.7.16-2+deb10u2
+python2.7	2.7.16-2+deb10u3
+python2.7-minimal	2.7.16-2+deb10u3
 python3	3.7.3-1
 python3-asn1crypto	0.24.0-1
 python3-cffi-backend	1.12.2-1
@@ -550,9 +550,9 @@
 python3-six	1.12.0-1
 python3-wheel	0.32.3-2
 python3-xdg	0.25-5
-python3.7	3.7.3-2+deb10u5
-python3.7-dev	3.7.3-2+deb10u5
-python3.7-minimal	3.7.3-2+deb10u5
+python3.7	3.7.3-2+deb10u6
+python3.7-dev	3.7.3-2+deb10u6
+python3.7-minimal	3.7.3-2+deb10u6
 rake	12.3.1-3+deb10u1
 readline-common	7.0-5
 ruby	1:2.5.1
diff --git a/gen_android_bp.sh b/gen_android_bp.sh
index 62ceeaf..4e751d9 100755
--- a/gen_android_bp.sh
+++ b/gen_android_bp.sh
@@ -176,7 +176,7 @@
 EOF
 
 for arch_dir in $(get_arch_dir aarch64) $(get_arch_dir x86_64); do
-  for i in $(echo $arch_dir/bin/{crosvm,lib{minijail.so,gfxstream_backend.so,*.so{.0,.1,.2,.7}}} | xargs -n1 | sort); do
+  for i in $(echo $arch_dir/bin/{crosvm,gfxstream_graphics_detector,lib{minijail.so,gfxstream_backend.so,*.so{.0,.1,.2,.7}}} | xargs -n1 | sort); do
     name="${i//\//_}"
     name="${name//-/_}"
     name="${name/_bin_/_}"
diff --git a/manifest.xml b/manifest.xml
index 953213a..f38cbc8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -18,7 +18,7 @@
   <project groups="gfxstream" name="platform/external/angle" path="external/angle" revision="2662abb218d15807856f25b93e100bdb10e0db45"/>
   <project groups="gfxstream" name="platform/external/flatbuffers" path="external/flatbuffers" revision="ecd19dd48a97b9e89fc9f387de5dce7e679e8077"/>
   <project groups="gfxstream" name="platform/external/lz4" path="external/lz4" revision="99b28c87054679e66517c9c3c89fe99654e15cfc"/>
-  <project groups="gfxstream" name="platform/hardware/google/aemu" path="hardware/google/aemu" revision="7d90df6fd73d2ab0513fc3f726f5b43be75c6651"/>
-  <project groups="gfxstream" name="platform/hardware/google/gfxstream" path="hardware/google/gfxstream" revision="8386badba01f2699a0b3e08f1d35a83c148c1990"/>
+  <project groups="gfxstream" name="platform/hardware/google/aemu" path="hardware/google/aemu" revision="dd8b929c247ce9872c775e0e5ddc4300011d0e82"/>
+  <project groups="gfxstream" name="platform/hardware/google/gfxstream" path="hardware/google/gfxstream" revision="f9f8caa7d5e863b707f7aef06c7ca1239fa0827f"/>
 
 </manifest>
diff --git a/rebuild-internal.sh b/rebuild-internal.sh
index 8d75828..693c7bc 100755
--- a/rebuild-internal.sh
+++ b/rebuild-internal.sh
@@ -89,7 +89,6 @@
       ninja-build \
       pkg-config \
       protobuf-compiler \
-      python \
       python3 \
       python3-pip \
       texinfo \
@@ -98,6 +97,9 @@
       xutils-dev # Needed to pacify autogen.sh for libepoxy
   mkdir -p "${TOOLS_DIR}"
 
+  # Repo needs python3 but python-is-python3 package not available:
+  sudo ln -s -f /usr/bin/python3 /usr/bin/python
+
   curl https://storage.googleapis.com/git-repo-downloads/repo > "${TOOLS_DIR}/repo"
   chmod a+x "${TOOLS_DIR}/repo"
 
@@ -350,11 +352,19 @@
   mkdir "${dist_dir}"
   cd "${dist_dir}"
 
-  cmake .. -G Ninja -DDEPENDENCY_RESOLUTION=AOSP
+  cmake .. \
+    -G Ninja \
+    -DBUILD_GRAPHICS_DETECTOR=ON \
+    -DDEPENDENCY_RESOLUTION=AOSP
+
   ninja
+
+  chmod +x "${dist_dir}"/gfxstream_graphics_detector
+  cp -a "${dist_dir}"/gfxstream_graphics_detector "${OUTPUT_BIN_DIR}"
+  debuglink gfxstream_graphics_detector
+
   chmod +x "${dist_dir}"/libgfxstream_backend.so
   cp -a "${dist_dir}"/libgfxstream_backend.so "${WORKING_DIR}"/usr/lib
-
   cp -a "${WORKING_DIR}"/usr/lib/libgfxstream_backend.so "${OUTPUT_BIN_DIR}"
   debuglink libgfxstream_backend.so
 }
diff --git a/x86_64-linux-gnu/Cargo.lock b/x86_64-linux-gnu/Cargo.lock
index a194fce..02884d7 100644
--- a/x86_64-linux-gnu/Cargo.lock
+++ b/x86_64-linux-gnu/Cargo.lock
@@ -126,7 +126,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.32",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.32",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -291,7 +291,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.32",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2014,9 +2014,9 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -2380,7 +2380,7 @@
  "argh",
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.32",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2465,9 +2465,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.32"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
@@ -3066,7 +3066,7 @@
 dependencies = [
  "proc-macro2",
  "quote 1.0.33",
- "syn 2.0.32",
+ "syn 2.0.39",
 ]
 
 [[package]]
diff --git a/x86_64-linux-gnu/bin/crosvm b/x86_64-linux-gnu/bin/crosvm
index a0f73fb..7dc6861 100755
--- a/x86_64-linux-gnu/bin/crosvm
+++ b/x86_64-linux-gnu/bin/crosvm
Binary files differ
diff --git a/x86_64-linux-gnu/bin/crosvm.debug b/x86_64-linux-gnu/bin/crosvm.debug
index c644984..dadde76 100755
--- a/x86_64-linux-gnu/bin/crosvm.debug
+++ b/x86_64-linux-gnu/bin/crosvm.debug
Binary files differ
diff --git a/x86_64-linux-gnu/bin/gfxstream_graphics_detector b/x86_64-linux-gnu/bin/gfxstream_graphics_detector
new file mode 100755
index 0000000..efdc83f
--- /dev/null
+++ b/x86_64-linux-gnu/bin/gfxstream_graphics_detector
Binary files differ
diff --git a/x86_64-linux-gnu/bin/gfxstream_graphics_detector.debug b/x86_64-linux-gnu/bin/gfxstream_graphics_detector.debug
new file mode 100755
index 0000000..00d4bde
--- /dev/null
+++ b/x86_64-linux-gnu/bin/gfxstream_graphics_detector.debug
Binary files differ
diff --git a/x86_64-linux-gnu/bin/libgfxstream_backend.so b/x86_64-linux-gnu/bin/libgfxstream_backend.so
index 1d7450d..aaf3fef 100755
--- a/x86_64-linux-gnu/bin/libgfxstream_backend.so
+++ b/x86_64-linux-gnu/bin/libgfxstream_backend.so
Binary files differ
diff --git a/x86_64-linux-gnu/bin/libgfxstream_backend.so.debug b/x86_64-linux-gnu/bin/libgfxstream_backend.so.debug
index d9de321..f3e21e5 100755
--- a/x86_64-linux-gnu/bin/libgfxstream_backend.so.debug
+++ b/x86_64-linux-gnu/bin/libgfxstream_backend.so.debug
Binary files differ
diff --git a/x86_64-linux-gnu/builder-packages.txt b/x86_64-linux-gnu/builder-packages.txt
index dfe786f..909e918 100644
--- a/x86_64-linux-gnu/builder-packages.txt
+++ b/x86_64-linux-gnu/builder-packages.txt
@@ -21,18 +21,18 @@
 cpp-aarch64-linux-gnu	4:8.3.0-1
 cross-config	2.6.15-3
 crossbuild-essential-arm64	12.6
-curl	7.64.0-4+deb10u6
+curl	7.64.0-4+deb10u7
 dash	0.5.10.2-5
 dblatex	0.3.10-2
 dblatex-doc	0.3.10-2
-dbus	1.12.24-0+deb10u1
+dbus	1.12.28-0+deb10u1
 debconf	1.5.71+deb10u1
 debian-archive-keyring	2019.1+deb10u2
 debianutils	4.8.6.1
 dh-python	3.20190308
 diffutils	1:3.7-3
 dirmngr	2.2.12-1+deb10u2
-distro-info-data	0.41+deb10u7
+distro-info-data	0.41+deb10u8
 docbook-xml	4.5-8
 docbook-xsl	1.79.1+dfsg-2
 doxygen	1.8.13-10
@@ -66,7 +66,7 @@
 gcc-8-base:amd64	8.3.0-6
 gcc-8-cross-base	8.3.0-2cross1
 gcc-aarch64-linux-gnu	4:8.3.0-1
-ghostscript	9.27~dfsg-2+deb10u8
+ghostscript	9.27~dfsg-2+deb10u9
 gir1.2-glib-2.0:amd64	1.58.3-2
 git	1:2.20.1-2+deb10u8
 git-man	1:2.20.1-2+deb10u8
@@ -89,7 +89,7 @@
 init-system-helpers	1.56+nmu1
 iso-codes	4.2-1
 javascript-common	11
-krb5-locales	1.17-3+deb10u5
+krb5-locales	1.17-3+deb10u6
 less	487-0.1+b1
 libacl1:amd64	2.2.53-4
 libalgorithm-c3-perl	0.10-1
@@ -140,16 +140,16 @@
 libcom-err2:amd64	1.44.5-1+deb10u3
 libconfig-auto-perl	0.44-1
 libconfig-inifiles-perl	3.000001-1
-libcups2:amd64	2.2.10-6+deb10u8
+libcups2:amd64	2.2.10-6+deb10u9
 libcupsfilters1:amd64	1.21.6-5+deb10u1
-libcupsimage2:amd64	2.2.10-6+deb10u8
-libcurl3-gnutls:amd64	7.64.0-4+deb10u6
-libcurl4:amd64	7.64.0-4+deb10u6
+libcupsimage2:amd64	2.2.10-6+deb10u9
+libcurl3-gnutls:amd64	7.64.0-4+deb10u7
+libcurl4:amd64	7.64.0-4+deb10u7
 libdata-dump-perl	1.23-1
 libdata-optlist-perl	0.110-1
 libdatrie1:amd64	0.2.12-2
 libdb5.3:amd64	5.3.28+dfsg1-0.5
-libdbus-1-3:amd64	1.12.24-0+deb10u1
+libdbus-1-3:amd64	1.12.28-0+deb10u1
 libdebconfclient0:amd64	0.249
 libdebian-dpkgcross-perl	2.6.15-3
 libdevel-callchecker-perl	0.008-1
@@ -171,7 +171,7 @@
 libegl-mesa0:amd64	18.3.6-2+deb10u1
 libegl1:amd64	1.1.0-1
 libegl1-mesa-dev:amd64	18.3.6-2+deb10u1
-libelf1:amd64	0.176-1.1
+libelf1:amd64	0.176-1.1+deb10u1
 libemail-date-format-perl	1.005-1
 libencode-locale-perl	1.05-1
 liberror-perl	0.17027-2
@@ -214,8 +214,8 @@
 libgles1:amd64	1.1.0-1
 libgles2:amd64	1.1.0-1
 libgles2-mesa-dev:amd64	18.3.6-2+deb10u1
-libglib2.0-0:amd64	2.58.3-2+deb10u4
-libglib2.0-data	2.58.3-2+deb10u4
+libglib2.0-0:amd64	2.58.3-2+deb10u5
+libglib2.0-data	2.58.3-2+deb10u5
 libglvnd-core-dev:amd64	1.1.0-1
 libglvnd-dev:amd64	1.1.0-1
 libglvnd0:amd64	1.1.0-1
@@ -228,9 +228,9 @@
 libgpg-error0:amd64	1.35-1
 libgpm2:amd64	1.20.7-5
 libgraphite2-3:amd64	1.3.13-7
-libgs9:amd64	9.27~dfsg-2+deb10u8
-libgs9-common	9.27~dfsg-2+deb10u8
-libgssapi-krb5-2:amd64	1.17-3+deb10u5
+libgs9:amd64	9.27~dfsg-2+deb10u9
+libgs9-common	9.27~dfsg-2+deb10u9
+libgssapi-krb5-2:amd64	1.17-3+deb10u6
 libgts-0.7-5:amd64	0.7.6+darcs121130-4
 libgts-bin	0.7.6+darcs121130-4
 libgvc6	2.40.1-6+deb10u1
@@ -267,11 +267,11 @@
 libjbig2dec0:amd64	0.16-1+deb10u1
 libjpeg62-turbo:amd64	1:1.5.2-2+deb10u1
 libjs-jquery	3.3.1~dfsg-3+deb10u1
-libk5crypto3:amd64	1.17-3+deb10u5
+libk5crypto3:amd64	1.17-3+deb10u6
 libkeyutils1:amd64	1.6-6
 libkpathsea6:amd64	2018.20181218.49446-1+deb10u2
-libkrb5-3:amd64	1.17-3+deb10u5
-libkrb5support0:amd64	1.17-3+deb10u5
+libkrb5-3:amd64	1.17-3+deb10u6
+libkrb5support0:amd64	1.17-3+deb10u6
 libksba8:amd64	1.3.5-2+deb10u2
 liblab-gamut1	2.40.1-6+deb10u1
 liblcms2-2:amd64	2.9-3
@@ -307,14 +307,14 @@
 libmro-compat-perl	0.13-1
 libnamespace-autoclean-perl	0.28-1
 libnamespace-clean-perl	0.27-1
-libncurses6:amd64	6.1+20181013-2+deb10u3
-libncursesw6:amd64	6.1+20181013-2+deb10u3
+libncurses6:amd64	6.1+20181013-2+deb10u4
+libncursesw6:amd64	6.1+20181013-2+deb10u4
 libnet-dbus-perl	1.1.0-5+b1
 libnet-http-perl	6.18-1
 libnet-smtp-ssl-perl	1.04-1
 libnet-ssleay-perl	1.85-2+deb10u1
 libnettle6:amd64	3.4.1-1+deb10u1
-libnghttp2-14:amd64	1.36.0-2+deb10u1
+libnghttp2-14:amd64	1.36.0-2+deb10u2
 libnpth0:amd64	1.6-1
 libopengl0:amd64	1.1.0-1
 libopenjp2-7:amd64	2.3.0-2+deb10u2
@@ -352,14 +352,14 @@
 libpthread-stubs0-dev:amd64	0.4-1
 libpython-stdlib:amd64	2.7.16-1
 libpython2-stdlib:amd64	2.7.16-1
-libpython2.7-minimal:amd64	2.7.16-2+deb10u2
-libpython2.7-stdlib:amd64	2.7.16-2+deb10u2
+libpython2.7-minimal:amd64	2.7.16-2+deb10u3
+libpython2.7-stdlib:amd64	2.7.16-2+deb10u3
 libpython3-dev:amd64	3.7.3-1
 libpython3-stdlib:amd64	3.7.3-1
-libpython3.7:amd64	3.7.3-2+deb10u5
-libpython3.7-dev:amd64	3.7.3-2+deb10u5
-libpython3.7-minimal:amd64	3.7.3-2+deb10u5
-libpython3.7-stdlib:amd64	3.7.3-2+deb10u5
+libpython3.7:amd64	3.7.3-2+deb10u6
+libpython3.7-dev:amd64	3.7.3-2+deb10u6
+libpython3.7-minimal:amd64	3.7.3-2+deb10u6
+libpython3.7-stdlib:amd64	3.7.3-2+deb10u6
 libquadmath0:amd64	8.3.0-6
 libreadline7:amd64	7.0-5
 libreadonly-perl	2.050-1
@@ -414,7 +414,7 @@
 libtie-ixhash-perl	1.23-2
 libtiff5:amd64	4.1.0+git191117-2~deb10u8
 libtimedate-perl	2.3000-2+deb10u1
-libtinfo6:amd64	6.1+20181013-2+deb10u3
+libtinfo6:amd64	6.1+20181013-2+deb10u4
 libtk8.6:amd64	8.6.9-2
 libtool	2.4.6-9
 libtry-tiny-perl	0.30-1
@@ -438,16 +438,16 @@
 libwayland-dev:amd64	1.16.0-1
 libwayland-egl1:amd64	1.16.0-1
 libwayland-server0:amd64	1.16.0-1
-libwebp6:amd64	0.6.1-2+deb10u2
+libwebp6:amd64	0.6.1-2+deb10u3
 libwoff1:amd64	1.0.2-1
 libwww-perl	6.36-2
 libwww-robotrules-perl	6.02-1
-libx11-6:amd64	2:1.6.7-1+deb10u3
-libx11-data	2:1.6.7-1+deb10u3
-libx11-dev:amd64	2:1.6.7-1+deb10u3
+libx11-6:amd64	2:1.6.7-1+deb10u4
+libx11-data	2:1.6.7-1+deb10u4
+libx11-dev:amd64	2:1.6.7-1+deb10u4
 libx11-protocol-perl	0.56-7
-libx11-xcb-dev:amd64	2:1.6.7-1+deb10u3
-libx11-xcb1:amd64	2:1.6.7-1+deb10u3
+libx11-xcb-dev:amd64	2:1.6.7-1+deb10u4
+libx11-xcb1:amd64	2:1.6.7-1+deb10u4
 libxapian30:amd64	1.4.11-1+deb10u1
 libxau-dev:amd64	1:1.0.8-1+b2
 libxau6:amd64	1:1.0.8-1+b2
@@ -501,7 +501,7 @@
 libxml2-utils	2.9.4+dfsg1-7+deb10u6
 libxmu6:amd64	2:1.1.2-2+b3
 libxmuu1:amd64	2:1.1.2-2+b3
-libxpm4:amd64	1:3.5.12-1+deb10u1
+libxpm4:amd64	1:3.5.12-1+deb10u2
 libxrandr2:amd64	2:1.5.1-1
 libxrender1:amd64	1:0.9.10-1
 libxshmfence-dev:amd64	1.3-1
@@ -561,8 +561,8 @@
 python-pip-whl	18.1-5
 python2	2.7.16-1
 python2-minimal	2.7.16-1
-python2.7	2.7.16-2+deb10u2
-python2.7-minimal	2.7.16-2+deb10u2
+python2.7	2.7.16-2+deb10u3
+python2.7-minimal	2.7.16-2+deb10u3
 python3	3.7.3-1
 python3-asn1crypto	0.24.0-1
 python3-cffi-backend	1.12.2-1
@@ -584,9 +584,9 @@
 python3-six	1.12.0-1
 python3-wheel	0.32.3-2
 python3-xdg	0.25-5
-python3.7	3.7.3-2+deb10u5
-python3.7-dev	3.7.3-2+deb10u5
-python3.7-minimal	3.7.3-2+deb10u5
+python3.7	3.7.3-2+deb10u6
+python3.7-dev	3.7.3-2+deb10u6
+python3.7-minimal	3.7.3-2+deb10u6
 rake	12.3.1-3+deb10u1
 readline-common	7.0-5
 ruby	1:2.5.1