Snap for 6520427 from 94aca3cedf3440a9c63cc073f34f32ad34e9666a to rvc-d1-release

Change-Id: I7d7985c2c917105028939ba8ea1c38fca77c419f

87 files changed, 521 insertions, 1 deletions

diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb
new file mode 100644
index 00000000..5bef6b27
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v1.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v1.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb
new file mode 100644
index 00000000..f2032412
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_additional_file.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_additional_file.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb
new file mode 100644
index 00000000..d5b1515a
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_additional_folder.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_additional_folder.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb
new file mode 100644
index 00000000..5c1ecd8d
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb
new file mode 100644
index 00000000..a3e05b58
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb
new file mode 100644
index 00000000..d4f42de6
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_different_certificate.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_different_certificate.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb
new file mode 100644
index 00000000..30c1658b
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_different_package_name.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_different_package_name.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb
new file mode 100644
index 00000000..7a4ba73a
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_no_hashtree.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_no_hashtree.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb
new file mode 100644
index 00000000..e046e3ab
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_sdk_target_p.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_sdk_target_p.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb
new file mode 100644
index 00000000..6ea9a6b5
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_signed_bob.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_signed_bob.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb
new file mode 100644
index 00000000..fe76dce4
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_signed_bob_rot.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb
new file mode 100644
index 00000000..c90ffbbe
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb
new file mode 100644
index 00000000..580a5f8a
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb
new file mode 100644
index 00000000..779f4993
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_unsigned_payload.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_unsigned_payload.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb
new file mode 100644
index 00000000..0bf9288a
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_with_post_install_hook.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb
new file mode 100644
index 00000000..5a1baf9b
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb
new file mode 100644
index 00000000..316c8d12
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_without_apk_in_apex.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb
new file mode 100644
index 00000000..3d5c0e90
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v2_wrong_sha.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_wrong_sha.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb
new file mode 100644
index 00000000..e03ee6e7
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v3.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v3.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb
new file mode 100644
index 00000000..daecf3c3
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v3_signed_bob.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v3_signed_bob.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb
new file mode 100644
index 00000000..420522bb
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_arm64/com.android.apex.cts.shim.v3_signed_bob_rot.apex"
+  }
+  dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb
new file mode 100644
index 00000000..239132ac
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v1.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v1.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb
new file mode 100644
index 00000000..f84e0c89
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_additional_file.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_additional_file.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb
new file mode 100644
index 00000000..635e2bbd
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_additional_folder.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_additional_folder.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb
new file mode 100644
index 00000000..cea53405
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb
new file mode 100644
index 00000000..2622af8f
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb
new file mode 100644
index 00000000..c25509a2
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_different_certificate.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_different_certificate.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb
new file mode 100644
index 00000000..ab8601fc
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_different_package_name.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_different_package_name.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb
new file mode 100644
index 00000000..f1ccd780
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_no_hashtree.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_no_hashtree.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb
new file mode 100644
index 00000000..1f24dedd
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_sdk_target_p.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_sdk_target_p.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb
new file mode 100644
index 00000000..e8c48e1e
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_signed_bob.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_signed_bob.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb
new file mode 100644
index 00000000..faf0e28b
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_signed_bob_rot.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb
new file mode 100644
index 00000000..5f1e6642
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb
new file mode 100644
index 00000000..03634a97
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb
new file mode 100644
index 00000000..aef234a7
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_unsigned_payload.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_unsigned_payload.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb
new file mode 100644
index 00000000..87b7c50f
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_with_post_install_hook.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb
new file mode 100644
index 00000000..727bce0d
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb
new file mode 100644
index 00000000..23155ba5
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_without_apk_in_apex.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb
new file mode 100644
index 00000000..2190954d
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_wrong_sha.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_wrong_sha.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb
new file mode 100644
index 00000000..e7006ae6
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v3.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v3.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb
new file mode 100644
index 00000000..bdcb62fb
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v3_signed_bob.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v3_signed_bob.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb
new file mode 100644
index 00000000..4f258589
--- /dev/null
+++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb
@@ -0,0 +1,12 @@
+drops {
+  android_build_drop {
+    build_id: "6508977"
+    target: "CtsShim"
+    source_file: "aosp_x86_64/com.android.apex.cts.shim.v3_signed_bob_rot.apex"
+  }
+  dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex"
+  version: ""
+  version_group: ""
+  git_project: "platform/system/apex"
+  git_branch: "rvc-dev"
+}
diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp
index a2f56cf6..8033a63f 100644
--- a/apexd/apexd.cpp
+++ b/apexd/apexd.cpp
@@ -1827,7 +1827,7 @@ Result<void> remountApexFile(const std::string& path) {
   return activatePackage(path);
 }
 
-void initialize(CheckpointInterface* checkpoint_service) {
+void initializeVold(CheckpointInterface* checkpoint_service) {
   if (checkpoint_service != nullptr) {
     gVoldService = checkpoint_service;
     Result<bool> supports_fs_checkpoints =
@@ -1848,7 +1848,10 @@ void initialize(CheckpointInterface* checkpoint_service) {
       }
     }
   }
+}
 
+void initialize(CheckpointInterface* checkpoint_service) {
+  initializeVold(checkpoint_service);
   Result<void> status = collectPreinstalledData(kApexPackageBuiltinDirs);
   if (!status.ok()) {
     LOG(ERROR) << "Failed to collect APEX keys : " << status.error();
diff --git a/apexd/apexd.h b/apexd/apexd.h
index cde69899..36f72beb 100644
--- a/apexd/apexd.h
+++ b/apexd/apexd.h
@@ -88,6 +88,8 @@ android::base::Result<void> destroyCeSnapshotsNotSpecified(
 int onBootstrap();
 // Small helper function to tell if device is currently booting.
 bool isBooting();
+// Sets the values of gVoldService and gInFsCheckpointMode.
+void initializeVold(CheckpointInterface* checkpoint_service);
 // Initializes in-memory state (e.g. pre-installed data, activated apexes).
 // Must be called first before calling any other boot sequence related function.
 void initialize(CheckpointInterface* checkpoint_service);
diff --git a/apexd/apexd_main.cpp b/apexd/apexd_main.cpp
index bb4fb99c..c60f4faf 100644
--- a/apexd/apexd_main.cpp
+++ b/apexd/apexd_main.cpp
@@ -54,6 +54,17 @@ int HandleSubcommand(char** argv) {
 
   if (strcmp("--snapshotde", argv[1]) == 0) {
     LOG(INFO) << "Snapshot DE subcommand detected";
+    // Need to know if checkpointing is enabled so that a prerestore snapshot
+    // can be taken if it's not.
+    android::base::Result<android::apex::VoldCheckpointInterface>
+        vold_service_st = android::apex::VoldCheckpointInterface::Create();
+    if (!vold_service_st.ok()) {
+      LOG(ERROR) << "Could not retrieve vold service: "
+                 << vold_service_st.error();
+    } else {
+      android::apex::initializeVold(&*vold_service_st);
+    }
+
     int result = android::apex::snapshotOrRestoreDeUserData();
 
     if (result == 0) {
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 cd1bc208..7b5758dc 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 63edbd32..dc2c8c9d 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 e91f134f..3cf81757 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 500dc7ac..53358189 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
index 9d7b0a20..4f0edff6 100644
--- 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
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 8641f6db..af89d200 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 eb26cf3c..12b85e43 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 42065784..00c0c197 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 5ee9333b..50e77bdd 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 8f0fefa3..3bde9ba5 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 adf7957f..26c3f27a 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 14fe8736..81aaecfc 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_unsigned_apk_container.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
index a64e7d42..b8444ba8 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex
index 2373c562..d2be4a2a 100644
--- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.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 dc131f3b..e1f904e6 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 e8a73ab5..c8aa9d98 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_without_apk_in_apex.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_without_apk_in_apex.apex
new file mode 100644
index 00000000..41c29bfd
--- /dev/null
+++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_without_apk_in_apex.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 4ec56c60..1447e7d2 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 967f2240..e538f831 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 064dde94..86b418e0 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 3cd1a252..29a0877b 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 2fdfc2b5..04ec92da 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 eacf2538..ff547892 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 e91f134f..3cf81757 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 500dc7ac..53358189 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
index 9d7b0a20..4f0edff6 100644
--- 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
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 8641f6db..af89d200 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 64bb0737..eca1c375 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 e7854991..19da8646 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 9c06e38a..6b7436b4 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 475d3a8f..659f4625 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 b3b2f369..c5e22108 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 914bedd8..3ff88a91 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_unsigned_apk_container.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
index ff26024a..07b8a6fc 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex
index 84c2496a..cd702268 100644
--- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.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 dc131f3b..e1f904e6 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 e8a73ab5..c8aa9d98 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_without_apk_in_apex.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_without_apk_in_apex.apex
new file mode 100644
index 00000000..41c29bfd
--- /dev/null
+++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_without_apk_in_apex.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 4ec56c60..1447e7d2 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 84a7fcf6..b3ecef76 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 e76ca8ef..9281ee39 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 cbd46f7a..23b23789 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