Merge remote-tracking branch 'cos/master' into cos-sdk

Sync repo before doing SDK rebuild

BUG=b/257113269
TEST=presubmit

Change-Id: Idf685048fe1af4f7c5811a2555ad7f720299ea0b
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 5c8152f..7069100 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -41,7 +41,7 @@
 _PYTHON_ALL_IMPLS=(
 	pypy3
 	python2_7
-	python3_6 python3_7 python3_8 python3_9
+	python3_7 python3_8 python3_9 python3_6
 )
 readonly _PYTHON_ALL_IMPLS