Update prebuilt CTS shim pkgs with the ones built on server

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
package: name='com.android.apex.cts.shim'
versionCode='1'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
package: name='com.android.apex.cts.shim.different'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'P'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
package: name='com.android.apex.cts.shim'
versionCode='1'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
package: name='com.android.apex.cts.shim.different'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'P'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
package: name='com.android.apex.cts.shim'
versionCode='2'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

system/apex/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
package: name='com.android.apex.cts.shim'
versionCode='3'
versionName=''
platformBuildVersionName='R'
platformBuildVersionCode='29'
compileSdkVersion='29'
compileSdkVersionCodename='R'
sdkVersion:'28'
targetSdkVersion:'29'

Built here:
https://android-build.googleplex.com/builds/submitted/6434058/CtsApexShim_arm64/latest
https://android-build.googleplex.com/builds/submitted/6434058/CtsApexShim_x86_64/latest

This build is suitable for public release.

Bug: 152021141
Test: presubmit
Change-Id: Ic8ab8a6ed08c2e48d20c8aaa1f11a1f9677ee73a

36 files changed, 0 insertions, 0 deletions

diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
index 0a77a65e..a5aa6edf 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
index 30f0e610..1ab12a6c 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
index cdbd503e..84a9fc78 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
index b4a2d37f..a42d08a0 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
new file mode 100644
index 00000000..4f599caf
--- /dev/null
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
index 5970eb9a..8ee5966c 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
index 8300cd7b..d6e920bf 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
index 99c1d2ef..45edd8b4 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
index 7c147ad7..b5d04cb4 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
index 3b0e8c3e..c20a61b2 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
index 45480c18..1b90199e 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
index e8bf9874..a0d79d5d 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
index 8b20f9d4..20798e93 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
index 454002d8..d53c3243 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
index 8e64b73f..2a3339ad 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
index acf3be2b..a1a04199 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
index b7a2d02d..0f63dde2 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
index 07e39779..8b92d945 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
index 0a6ec9b1..4fcf7a54 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
index c9555a43..fc7f3d40 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
index c6f67308..b3fbed8d 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
index cb407098..a5ba9e11 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
new file mode 100644
index 00000000..7ecc0a6a
--- /dev/null
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
index 061f00df..c693b26c 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
index 89d687da..7c281810 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
index c505cabf..31953d60 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
index 961021f5..fcf2043f 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
index 482d3d87..28d28980 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
index c461d9f1..6447e77b 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
index cfdc9f0c..5eb830d4 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
index 9f22e235..7615ab30 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
index 6300cafa..3a94a56a 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
index 02dec8a5..156ebe17 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
index 030e57d1..e35ac044 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
index 39570853..92151a11 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
index 017096e1..c1af2de3 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex