[coastguard skipped] Merge sparse cherrypicks from sparse-12901423-L76600030009440540 into android12L-tests-release.

Change-Id: I253d9e90432e0a2b48ba68cc934af30f4429d08e

default.xml

@@ -5,7 +5,7 @@
 
   <contactinfo bugurl="go/repo-bug" />
 
-  <project path="build/make" name="platform/build" revision="085311ce2277b3ba920bf1ab51bdb67a7f4c85d7" groups="pdk" upstream="android12L-tests-release">
+  <project path="build/make" name="platform/build" revision="4fc8426c7bbf2799ecd81f66c07897431c42efec" groups="pdk" upstream="android12L-tests-release">
     <copyfile src="core/root.mk" dest="Makefile" />
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
@@ -30,7 +30,7 @@
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" revision="e8aadb8b03fca3c1e0fd938e8f8486de4bafd965" upstream="android12L-tests-release" />
   <project path="bootable/libbootloader" name="platform/bootable/libbootloader" groups="vts,pdk" revision="adde7e6fdd387032ce321d46842318ef8d7f68a0" upstream="android12L-tests-release" />
   <project path="compatibility/cdd" name="platform/compatibility/cdd" groups="pdk" revision="b894313362dca9782471f090530f5e0896115efa" upstream="android12L-tests-release" />
-  <project path="cts" name="platform/cts" revision="580ff31d6b01743e51fe87d1adde1a5c431482de" groups="cts,pdk-cw-fs,pdk-fs" upstream="android12L-tests-release" />
+  <project path="cts" name="platform/cts" revision="23b5e73f53d52d2b692c021741b2e9347f891c3b" groups="cts,pdk-cw-fs,pdk-fs" upstream="android12L-tests-release" />
   <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs,pdk-fs" revision="ae1c3ddc6f5863c97e2b98e1213cb284620ee1fd" upstream="android12L-tests-release" />
   <project path="developers/build" name="platform/developers/build" groups="developers,pdk" revision="4e30fdb4cd8f7176f7341fd037ad2235b00c32f7" upstream="android12L-tests-release" />
   <project path="developers/demos" name="platform/developers/demos" groups="developers" revision="03814c35b8ee0a1284c667556260124d97466b28" upstream="android12L-tests-release" />