diff --git a/metadata/md5-cache/chromeos-base/autotest-0.0.2-r13388 b/metadata/md5-cache/chromeos-base/autotest-0.0.2-r13389
similarity index 86%
rename from metadata/md5-cache/chromeos-base/autotest-0.0.2-r13388
rename to metadata/md5-cache/chromeos-base/autotest-0.0.2-r13389
index 3d18c6f..3be9850 100644
--- a/metadata/md5-cache/chromeos-base/autotest-0.0.2-r13388
+++ b/metadata/md5-cache/chromeos-base/autotest-0.0.2-r13389
@@ -4,11 +4,11 @@
 DESCRIPTION=Autotest scripts and tools
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5_7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4
+IUSE=cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e_7351a21ed3d8b41cceeb3acfa305a1c42aaf07e4
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!<chromeos-base/autotest-chrome-0.0.1-r1788 !<chromeos-base/autotest-tests-0.0.1-r3291 !<chromeos-base/autotest-deps-0.0.2 virtual/autotest-libs virtual/autotest-assistant-libs
 SLOT=0
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=320715df1f30cf3c9ebf75fa17ea7111
+_md5_=44dc15a0c9c6359b76428d355bc8e7d8
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-0.0.4-r13354 b/metadata/md5-cache/chromeos-base/autotest-deps-0.0.4-r13355
similarity index 88%
rename from metadata/md5-cache/chromeos-base/autotest-deps-0.0.4-r13354
rename to metadata/md5-cache/chromeos-base/autotest-deps-0.0.4-r13355
index 8b5fef3..ed74dd0 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-0.0.4-r13354
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-0.0.4-r13355
@@ -3,11 +3,11 @@
 DESCRIPTION=Autotest common deps
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-cpp/gtest:= dev-libs/libnl:0 >=dev-python/grpcio-1.19 >=dev-python/psutil-5.5.0 sys-devel/binutils autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ab9cbdcfa79a17dc593b6a01c9523e1
+_md5_=638525b2cc7215e7a0268fccc0958999
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-camera-hal3-0.0.1-r5375 b/metadata/md5-cache/chromeos-base/autotest-deps-camera-hal3-0.0.1-r5376
similarity index 87%
rename from metadata/md5-cache/chromeos-base/autotest-deps-camera-hal3-0.0.1-r5375
rename to metadata/md5-cache/chromeos-base/autotest-deps-camera-hal3-0.0.1-r5376
index 5c0c5c9..b5c6d76 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-camera-hal3-0.0.1-r5375
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-camera-hal3-0.0.1-r5376
@@ -3,11 +3,11 @@
 DESCRIPTION=Dependencies for camera_HAL3 autotest
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
 RDEPEND=media-libs/cros-camera-test autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9bee7970b0280c5b8433d37bb8cff4a
+_md5_=2fc7657ff12c3f2496d75adaa94a01eb
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-cellular-0.0.1-r8164 b/metadata/md5-cache/chromeos-base/autotest-deps-cellular-0.0.1-r8165
similarity index 86%
rename from metadata/md5-cache/chromeos-base/autotest-deps-cellular-0.0.1-r8164
rename to metadata/md5-cache/chromeos-base/autotest-deps-cellular-0.0.1-r8165
index ff60431..aac3a0b 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-cellular-0.0.1-r8164
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-cellular-0.0.1-r8165
@@ -4,11 +4,11 @@
 DESCRIPTION=Autotest cellular deps
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!<chromeos-base/autotest-deps-0.0.3 virtual/libgudev chromeos-base/autotest-fakemodem-conf dev-libs/dbus-glib autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=3d6e04c4a5e0f9205fc8b56ef3e6a2ee
+_md5_=bac811e3ba2c2a4dde03a40f5f8a0056
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-dbus-0.0.1-r4048 b/metadata/md5-cache/chromeos-base/autotest-deps-dbus-0.0.1-r4049
similarity index 86%
rename from metadata/md5-cache/chromeos-base/autotest-deps-dbus-0.0.1-r4048
rename to metadata/md5-cache/chromeos-base/autotest-deps-dbus-0.0.1-r4049
index d91d463..f3e2314 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-dbus-0.0.1-r4048
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-dbus-0.0.1-r4049
@@ -3,11 +3,11 @@
 DESCRIPTION=Autotest D-Bus deps
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
 RDEPEND=autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09d84ee0d2fd08b04b4094bb0dc68d26
+_md5_=1c8235b74d6f2d36a8dce479b87a017f
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r8535 b/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r8536
similarity index 89%
rename from metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r8535
rename to metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r8536
index e55d682..94d73a9 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r8535
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-glmark2-0.0.1-r8536
@@ -4,11 +4,11 @@
 DESCRIPTION=Autotest glmark2 dependency
 EAPI=7
 HOMEPAGE=https://launchpad.net/glmark2
-IUSE=-asan +autotest asan coverage fuzzer msan tsan ubsan cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=-asan +autotest asan coverage fuzzer msan tsan ubsan cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=app-benchmarks/glmark2 autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-sanitizers	57b514c0d35fe88c97590a2a19e95e4d	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=dc91b26bfed61a1fbe5f014fb0a28d39
+_md5_=f2b331138e0c7b50c349bdbd7eec90ed
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-graphics-0.0.1-r8515 b/metadata/md5-cache/chromeos-base/autotest-deps-graphics-0.0.1-r8516
similarity index 87%
rename from metadata/md5-cache/chromeos-base/autotest-deps-graphics-0.0.1-r8515
rename to metadata/md5-cache/chromeos-base/autotest-deps-graphics-0.0.1-r8516
index fcdb00e..661b60b 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-graphics-0.0.1-r8515
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-graphics-0.0.1-r8516
@@ -3,11 +3,11 @@
 DESCRIPTION=Dependencies for graphics autotests
 EAPI=4
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!<chromeos-base/autotest-deps-0.0.4 autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8e5b4ca290e991eb98316d86e3c085d
+_md5_=8f94d713856eed271e5338cb7a6f8322
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-p2p-0.0.1-r8127 b/metadata/md5-cache/chromeos-base/autotest-deps-p2p-0.0.1-r8128
similarity index 88%
rename from metadata/md5-cache/chromeos-base/autotest-deps-p2p-0.0.1-r8127
rename to metadata/md5-cache/chromeos-base/autotest-deps-p2p-0.0.1-r8128
index 2a09ea8..868cd26 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-p2p-0.0.1-r8127
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-p2p-0.0.1-r8128
@@ -3,11 +3,11 @@
 DESCRIPTION=Autotest p2p deps
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!<chromeos-base/autotest-deps-0.0.4 dev-python/dpkt autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f0c8c4d7f7a01b1c6b491ed4526f52e4
+_md5_=3dba0954cb291b7f95dba1271cc41890
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r12778 b/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r12779
similarity index 89%
rename from metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r12778
rename to metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r12779
index effd610..2a44fe3 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r12778
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-piglit-0.0.1-r12779
@@ -4,11 +4,11 @@
 DESCRIPTION=dependencies for Piglit (collection of automated tests for OpenGl based on glean and mesa)
 EAPI=7
 HOMEPAGE=http://cgit.freedesktop.org/piglit
-IUSE=+autotest opengl cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest opengl cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2 LGPL-3
 PROPERTIES=live
 RDEPEND=opengl? ( virtual/glut ) opengl? ( virtual/opengl ) dev-python/mako dev-python/numpy media-libs/tiff media-libs/libpng sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXpm x11-libs/libXrender opengl? ( x11-proto/glproto ) autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=c1f6c715d3deea256fcc523f9853fbe7
+_md5_=e9bcdd593c91561bf33cf9d88120386d
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-policy-0.0.1-r4124 b/metadata/md5-cache/chromeos-base/autotest-deps-policy-0.0.1-r4125
similarity index 87%
rename from metadata/md5-cache/chromeos-base/autotest-deps-policy-0.0.1-r4124
rename to metadata/md5-cache/chromeos-base/autotest-deps-policy-0.0.1-r4125
index 85b9cdc..6926a91 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-policy-0.0.1-r4124
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-policy-0.0.1-r4125
@@ -3,11 +3,11 @@
 DESCRIPTION=Autotest policy deps
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70c365a3a9290fce2c81b18a8188254a
+_md5_=de3e6d20100728808c212ec9e246578d
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-touchpad-0.0.1-r9137 b/metadata/md5-cache/chromeos-base/autotest-deps-touchpad-0.0.1-r9138
similarity index 85%
rename from metadata/md5-cache/chromeos-base/autotest-deps-touchpad-0.0.1-r9137
rename to metadata/md5-cache/chromeos-base/autotest-deps-touchpad-0.0.1-r9138
index c535d68..8f1f249 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-touchpad-0.0.1-r9137
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-touchpad-0.0.1-r9138
@@ -4,11 +4,11 @@
 DESCRIPTION=Autotest touchpad deps
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-drivers/touchpad-tests chromeos-base/touch_firmware_test chromeos-base/mttools autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=5d07ebd5ba8339ef9da772d7ed477948
+_md5_=958188fefcb767cb128d20ad2deff3cb
diff --git a/metadata/md5-cache/chromeos-base/autotest-deps-webgl-mpd-0.0.1-r8687 b/metadata/md5-cache/chromeos-base/autotest-deps-webgl-mpd-0.0.1-r8688
similarity index 81%
rename from metadata/md5-cache/chromeos-base/autotest-deps-webgl-mpd-0.0.1-r8687
rename to metadata/md5-cache/chromeos-base/autotest-deps-webgl-mpd-0.0.1-r8688
index ce30fbe..99c6d61 100644
--- a/metadata/md5-cache/chromeos-base/autotest-deps-webgl-mpd-0.0.1-r8687
+++ b/metadata/md5-cache/chromeos-base/autotest-deps-webgl-mpd-0.0.1-r8688
@@ -3,11 +3,11 @@
 DESCRIPTION=Dependencies for WebGL many planets deep test
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=autotest? ( chromeos-base/autotest )
-SLOT=0/0.0.1-r8687
+SLOT=0/0.0.1-r8688
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	autotest-deponly	9b1e5d19c437abea0e7c0fa90c192abd	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=f20ced0df907409d605541bb6da33339
+_md5_=79f95c48c126db3fc4a5481cca019791
diff --git a/metadata/md5-cache/chromeos-base/autotest-tests-arc-public-0.0.1-r1072 b/metadata/md5-cache/chromeos-base/autotest-tests-arc-public-0.0.1-r1073
similarity index 92%
rename from metadata/md5-cache/chromeos-base/autotest-tests-arc-public-0.0.1-r1072
rename to metadata/md5-cache/chromeos-base/autotest-tests-arc-public-0.0.1-r1073
index c00bcf8..48c1a1f 100644
--- a/metadata/md5-cache/chromeos-base/autotest-tests-arc-public-0.0.1-r1072
+++ b/metadata/md5-cache/chromeos-base/autotest-tests-arc-public-0.0.1-r1073
@@ -2,11 +2,11 @@
 DEPEND=dev-python/pyxattr chromeos-base/chromeos-chrome chromeos-base/autotest-chrome chromeos-base/telemetry
 DESCRIPTION=Public ARC autotests
 EAPI=5
-IUSE=+autotest +buildcheck autotest opengles cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5
+IUSE=+autotest +buildcheck autotest opengles cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
 RDEPEND=dev-python/pyxattr chromeos-base/chromeos-chrome chromeos-base/autotest-chrome chromeos-base/telemetry autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3513e4bcba3092aa18c2868bfc03c521
+_md5_=a58ffca1f9921bf9916487842436475b
diff --git a/metadata/md5-cache/chromeos-base/autotest-tests-toolchain-0.0.1-r8 b/metadata/md5-cache/chromeos-base/autotest-tests-toolchain-0.0.1-r9
similarity index 91%
rename from metadata/md5-cache/chromeos-base/autotest-tests-toolchain-0.0.1-r8
rename to metadata/md5-cache/chromeos-base/autotest-tests-toolchain-0.0.1-r9
index 4e258bf..2bfce0b 100644
--- a/metadata/md5-cache/chromeos-base/autotest-tests-toolchain-0.0.1-r8
+++ b/metadata/md5-cache/chromeos-base/autotest-tests-toolchain-0.0.1-r9
@@ -3,11 +3,11 @@
 DESCRIPTION=Compilation and runtime tests for toolchain
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest +tests_platform_ToolchainTests cros_host cros_workon_tree_d735a7aa3779bb7bf68da958b38245fc59fee49c +buildcheck autotest opengles
+IUSE=+autotest +tests_platform_ToolchainTests cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!<chromeos-base/autotest-tests-0.0.3 chromeos-base/toolchain-tests autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8481b6321eff1c865476e2b65d03ee95
+_md5_=b8153a4064d293dac70b96207a2a349c
diff --git a/metadata/md5-cache/chromeos-base/autotest-tests-vm-host-0.0.1-r1710 b/metadata/md5-cache/chromeos-base/autotest-tests-vm-host-0.0.1-r1711
similarity index 90%
rename from metadata/md5-cache/chromeos-base/autotest-tests-vm-host-0.0.1-r1710
rename to metadata/md5-cache/chromeos-base/autotest-tests-vm-host-0.0.1-r1711
index 9af23fb..0141162 100644
--- a/metadata/md5-cache/chromeos-base/autotest-tests-vm-host-0.0.1-r1710
+++ b/metadata/md5-cache/chromeos-base/autotest-tests-vm-host-0.0.1-r1711
@@ -2,11 +2,11 @@
 DESCRIPTION=kvm host autotests
 EAPI=5
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=+autotest +tests_vm_CrosVmStart cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5 +buildcheck autotest opengles
+IUSE=+autotest +tests_vm_CrosVmStart cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e +buildcheck autotest opengles
 KEYWORDS=*
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=autotest? ( chromeos-base/autotest )
 SLOT=0
 _eclasses_=autotest	605b7cb5c6f24c3d362106dee3d4b20e	cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e7755ee7ab2cae60c6f624e3f737be8
+_md5_=44f06f47d42b7fa3b876df9272686849
diff --git a/metadata/md5-cache/chromeos-base/toolchain-tests-0.0.1-r4207 b/metadata/md5-cache/chromeos-base/toolchain-tests-0.0.1-r4208
similarity index 81%
rename from metadata/md5-cache/chromeos-base/toolchain-tests-0.0.1-r4207
rename to metadata/md5-cache/chromeos-base/toolchain-tests-0.0.1-r4208
index 042da23..b07bb65 100644
--- a/metadata/md5-cache/chromeos-base/toolchain-tests-0.0.1-r4207
+++ b/metadata/md5-cache/chromeos-base/toolchain-tests-0.0.1-r4208
@@ -3,10 +3,10 @@
 DESCRIPTION=Compilation and runtime tests for toolchain
 EAPI=7
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/third_party/autotest/
-IUSE=cros_host cros_workon_tree_1ece3259081f8307b48532c6c554999384394ce5
+IUSE=cros_host cros_workon_tree_e9ece5b042940104ff090f422ad42ec111529b6e
 KEYWORDS=*
 LICENSE=BSD-Google
 PROPERTIES=live
-SLOT=0/0.0.1-r4207
+SLOT=0/0.0.1-r4208
 _eclasses_=cros-constants	bf71cd1168b6441b64a8cdbc06c36eda	cros-credentials	4fd98ebbff6a1534ca9a89547e13dc92	cros-workon	3c446e00b1c9dc41ef3953d89c0ba6d2	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	d6a1d7d3b4c4fff2fba86e3f53beeb0f	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	2237e0dad80252483b9faa240a43ce2a
-_md5_=3affac68a97bc9892ab444c038d1c35d
+_md5_=ba04e20b479a79e79654bb62aa19ee0f