Clean up VNDK APEXes am: e4b698f698main-16k-with-phones

Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/2319749

Change-Id: Ie5055fb63421e66c86b2fdb3ffb741b103fb3f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

39 files changed, 29 insertions, 747 deletions

diff --git a/apex/Android.bp b/apex/Android.bp
index 27e28a5..2989ebd 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,14 +16,18 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-apex_vndk {
-    name: "com.android.vndk.current",
-    manifest: "apex_manifest.current.json",
-    key: "com.android.vndk.current.key",
-    certificate: ":com.android.vndk.current.certificate",
+apex_defaults {
+    name: "vndk-apex-defaults",
+    manifest: "apex_manifest.json",
+    key: "com.android.vndk.key",
+    certificate: ":com.android.vndk.certificate",
     file_contexts: ":com.android.vndk-file_contexts",
     updatable: false,
-    generate_hashtree: false,
+}
+
+apex_vndk {
+    name: "com.android.vndk.current",
+    defaults: ["vndk-apex-defaults"],
 }
 
 override_apex {
@@ -33,144 +37,54 @@ override_apex {
 }
 
 apex_key {
-    name: "com.android.vndk.current.key",
-    public_key: "com.android.vndk.current.pubkey",
-    private_key: "com.android.vndk.current.pem",
+    name: "com.android.vndk.key",
+    public_key: "com.android.vndk.pubkey",
+    private_key: "com.android.vndk.pem",
 }
 
 android_app_certificate {
-    name: "com.android.vndk.current.certificate",
-    certificate: "com.android.vndk.current",
+    name: "com.android.vndk.certificate",
+    certificate: "com.android.vndk",
 }
 
 apex_vndk {
     name: "com.android.vndk.v33",
-    manifest: "apex_manifest.v33.json",
-    key: "com.android.vndk.v33.key",
-    certificate: ":com.android.vndk.v33.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "33",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v33.key",
-    public_key: "com.android.vndk.v33.pubkey",
-    private_key: "com.android.vndk.v33.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v33.certificate",
-    certificate: "com.android.vndk.v33",
 }
 
 apex_vndk {
     name: "com.android.vndk.v32",
-    manifest: "apex_manifest.v32.json",
-    key: "com.android.vndk.v32.key",
-    certificate: ":com.android.vndk.v32.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "32",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v32.key",
-    public_key: "com.android.vndk.v32.pubkey",
-    private_key: "com.android.vndk.v32.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v32.certificate",
-    certificate: "com.android.vndk.v32",
 }
 
 apex_vndk {
     name: "com.android.vndk.v31",
-    manifest: "apex_manifest.v31.json",
-    key: "com.android.vndk.v31.key",
-    certificate: ":com.android.vndk.v31.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "31",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v31.key",
-    public_key: "com.android.vndk.v31.pubkey",
-    private_key: "com.android.vndk.v31.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v31.certificate",
-    certificate: "com.android.vndk.v31",
 }
 
 apex_vndk {
     name: "com.android.vndk.v30",
-    manifest: "apex_manifest.v30.json",
-    key: "com.android.vndk.v30.key",
-    certificate: ":com.android.vndk.v30.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "30",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v30.key",
-    public_key: "com.android.vndk.v30.pubkey",
-    private_key: "com.android.vndk.v30.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v30.certificate",
-    certificate: "com.android.vndk.v30",
 }
 
 apex_vndk {
     name: "com.android.vndk.v29",
-    manifest: "apex_manifest.v29.json",
-    key: "com.android.vndk.v29.key",
-    certificate: ":com.android.vndk.v29.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "29",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v29.key",
-    public_key: "com.android.vndk.v29.pubkey",
-    private_key: "com.android.vndk.v29.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v29.certificate",
-    certificate: "com.android.vndk.v29",
 }
 
 apex_vndk {
     name: "com.android.vndk.v28",
-    manifest: "apex_manifest.v28.json",
-    key: "com.android.vndk.v28.key",
-    certificate: ":com.android.vndk.v28.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "28",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
-    updatable: false,
-}
-
-apex_key {
-    name: "com.android.vndk.v28.key",
-    public_key: "com.android.vndk.v28.pubkey",
-    private_key: "com.android.vndk.v28.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v28.certificate",
-    certificate: "com.android.vndk.v28",
 }
diff --git a/apex/CleanSpec.mk b/apex/CleanSpec.mk
deleted file mode 100644
index 94b1b3d..0000000
--- a/apex/CleanSpec.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.vndk.*)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_ext/apex/com.android.vndk.*)
-
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/llndk.libraries.*.txt)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vndksp.libraries.*.txt)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vndkcore.libraries.*.txt)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vndkprivate.libraries.*.txt)
\ No newline at end of file
diff --git a/apex/README.md b/apex/README.md
index e98c63d..c37e7bf 100644
--- a/apex/README.md
+++ b/apex/README.md
@@ -8,57 +8,13 @@ change "30" to what you're adding. (eg. 31)
 ```
 apex_vndk {
     name: "com.android.vndk.v30",
-    manifest: "apex_manifest.v30.json",
-    key: "com.android.vndk.v30.key",
-    certificate: ":com.android.vndk.v30.certificate",
+    defaults: ["vndk-apex-defaults"],
     vndk_version: "30",
     system_ext_specific: true,
-    file_contexts: ":com.android.vndk-file_contexts",
 }
-
-apex_key {
-    name: "com.android.vndk.v30.key",
-    public_key: "com.android.vndk.v30.pubkey",
-    private_key: "com.android.vndk.v30.pem",
-}
-
-android_app_certificate {
-    name: "com.android.vndk.v30.certificate",
-    certificate: "com.android.vndk.v30",
-}
-```
-
-2. Add `apex_manifest.v30.json`
-
-```
-{
-  "name": "com.android.vndk.v30",
-  "version": 1
-}
-```
-
-3. Add keys/ceritificate
-
-```
-openssl genrsa -out com.android.vndk.v30.pem 4096
-avbtool extract_public_key --key com.android.vndk.v30.pem --output com.android.vndk.v30.pubkey
-openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem -out com.android.vndk.v30.x509.pem
-
-# Enter following info via the interactive prompts
-# Country Name: US
-# State: California
-# Locality Name: Mountain View
-# Organization Name: Android
-# Organization Unit Name: Android
-# Common Name: com.android.vndk
-# Email address: android@android.com
-
-openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out com.android.vndk.v30.pk8 -nocrypt
-
-rm key.pem
 ```
 
-4. Verify
+2. Verify
 
 ```
 m com.android.vndk.v30
diff --git a/apex/apex_manifest.current.json b/apex/apex_manifest.current.json
deleted file mode 100644
index b28dd44..0000000
--- a/apex/apex_manifest.current.json
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{
-  "name": "com.android.vndk.current",
-  "version": 1
-}
-
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
new file mode 100644
index 0000000..08ad49c
--- /dev/null
+++ b/apex/apex_manifest.json
@@ -0,0 +1,6 @@
+
+{
+  "name": "com.android.vndk",
+  "version": 1
+}
+
diff --git a/apex/apex_manifest.v28.json b/apex/apex_manifest.v28.json
deleted file mode 100644
index c8e38c6..0000000
--- a/apex/apex_manifest.v28.json
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{
-  "name": "com.android.vndk.v28",
-  "version": 1
-}
-
diff --git a/apex/apex_manifest.v29.json b/apex/apex_manifest.v29.json
deleted file mode 100644
index 9cf33b0..0000000
--- a/apex/apex_manifest.v29.json
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{
-  "name": "com.android.vndk.v29",
-  "version": 1
-}
-
diff --git a/apex/apex_manifest.v30.json b/apex/apex_manifest.v30.json
deleted file mode 100644
index 89d1bb8..0000000
--- a/apex/apex_manifest.v30.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.android.vndk.v30",
-  "version": 1
-}
\ No newline at end of file
diff --git a/apex/apex_manifest.v31.json b/apex/apex_manifest.v31.json
deleted file mode 100644
index 92a0a28..0000000
--- a/apex/apex_manifest.v31.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.android.vndk.v31",
-  "version": 1
-}
diff --git a/apex/apex_manifest.v32.json b/apex/apex_manifest.v32.json
deleted file mode 100644
index 29b08ac..0000000
--- a/apex/apex_manifest.v32.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.android.vndk.v32",
-  "version": 1
-}
diff --git a/apex/apex_manifest.v33.json b/apex/apex_manifest.v33.json
deleted file mode 100644
index 28bd8c8..0000000
--- a/apex/apex_manifest.v33.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.android.vndk.v33",
-  "version": 1
-}
diff --git a/apex/com.android.vndk.current.pem b/apex/com.android.vndk.pem
index 8e71ede..8e71ede 100644
--- a/apex/com.android.vndk.current.pem
+++ b/apex/com.android.vndk.pem
diff --git a/apex/com.android.vndk.current.pk8 b/apex/com.android.vndk.pk8
index 9eaa0da..9eaa0da 100644
--- a/apex/com.android.vndk.current.pk8
+++ b/apex/com.android.vndk.pk8
diff --git a/apex/com.android.vndk.current.pubkey b/apex/com.android.vndk.pubkey
index f408d2b..f408d2b 100644
--- a/apex/com.android.vndk.current.pubkey
+++ b/apex/com.android.vndk.pubkey
diff --git a/apex/com.android.vndk.v28.pem b/apex/com.android.vndk.v28.pem
deleted file mode 100644
index 2851a96..0000000
--- a/apex/com.android.vndk.v28.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v28.pk8 b/apex/com.android.vndk.v28.pk8
deleted file mode 100644
index 0b5e36b..0000000
--- a/apex/com.android.vndk.v28.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v28.pubkey b/apex/com.android.vndk.v28.pubkey
deleted file mode 100644
index 84c0b0b..0000000
--- a/apex/com.android.vndk.v28.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v28.x509.pem b/apex/com.android.vndk.v28.x509.pem
deleted file mode 100644
index 15d40fa..0000000
--- a/apex/com.android.vndk.v28.x509.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbTCCA1WgAwIBAgIUQDVa5uJONC7+44ANiNmx7p1J55kwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0xOTA5MDkwNzQzMjhaGA80NzU3
-MDgwNTA3NDMyOFowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAPTy+e0srxhjEkMi1Z04pdOCgHF1MBOoZCLSDOHu
-wqnnnswaAgklNyEB2SQ0Z9O35JiqUqQuwwHHoRHjuUvg8sIrn5J1r8lRJIW5KvX0
-fUp+Rl3wgORWvAzGRd+P4GvSFu12naeQ0Xu09XISiG8DqEwLeC/WiJ2TuB56lvUh
-6Owusfhf0FGCp79+Cnvr3Wju5e76oUMvkgKjfN0fcBgvzNvf/zQlYFUBdzPpwtK5
-SO3yvPfmN8HsmoVjXzItJBNMUJ1C5fEwCW1Q+ViVE+2SgRsstxRXzkI9FPFwgYG/
-afkAMnW9V50LKiAtfTumOig02OGCrEIYTYBV01Kyy8MRZxfweP69E27EQkVUM1Om
-Z3WsIDfFK3DxDuYf+UHE4yGySs3tLRUAgpNCecgu5PtLfq6TOmB4jwFSTb3VZinn
-8MERXILyERUjfitMPtK3/OV0vcUvJ1W0Rvz5qdyw1AD183v3u/xEYT9wO216GvrD
-NTMy6AB/Jj4c7a5On3/BfYixlUJYbfrClch0e4+CbZSNZrk/GL2WXcD76BgVWTPm
-XGT/8VkqIwiuGDgBVcgdXiaPUaRoCMSBnEVvSYbSrai1iUZV5ZrxGpofBJGWhVnu
-rh31JUZ+arzKX2PKqo5CYjB2xK/g3z1aU0RV0kbTGm6yPRfILdj4sIoo7KXZB2hw
-VdmdAgMBAAGjUzBRMB0GA1UdDgQWBBTL4EE6M2BaFjBToBdgRaaWxHxPujAfBgNV
-HSMEGDAWgBTL4EE6M2BaFjBToBdgRaaWxHxPujAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBCwUAA4ICAQATK0Z4iHlNVkFoIuXEZT4fA4YQUHQPpW+vNUQ5OZik
-5e3xAEs/TJOTHXIqkfhKop7QHCCuwrvb8Vp0+MfllkvQlIeMO3jFQzXJS1NoB4IS
-4saO7BZQycEWDtCqbmT0+2Hqbhpi3KxDpHKiR0rh39hGoe0yYxqaLl3HmimEKXnm
-nryUQ8KU1TCfuWvzA/fY7tE5F1svNz6Q3AQN52bNV8hkEmsIyvK+PoC41rxEBfsE
-y6qDN8LN1y8EenuRSyyJQEhIFMSXnn4oprFG1d7iYTZ8KCvepXB7KZrxTDq7JNMx
-UzJU6ctpmM7OnOkRXgjurhrwTG58E3T3vCHnWVLR0pRJSuKKU2/CbNhswBvxcNsb
-NdMfuRI8Comwki9d0uAvH6PalRAytlvnOpaWZUXosM0qAo+TW9XB35njtG0FVm3v
-2f7d1t93JuOixoIosQRzD1cnTypEa875UNpL2NIQzWBLmjjJnH2Ca9yHg+3BkflO
-LBKzrSITRrgbuMp4pwh7cKXN3YM1NWUjFLp2DGxStu7901z3MRTM3uhSzSZQddTw
-A42dWxkAANeVlvDIG+IV2knhJu6z+a2HjW7tyIBBYkW9gaVXYGX3W5FfbQXy+oFt
-Rarx2xrjsufH9uIOtfrhC+oBRxzc3VtNrOfpGvViugz1WSy0JDGbxaWbF4R1nfSL
-aQ==
------END CERTIFICATE-----
diff --git a/apex/com.android.vndk.v29.pem b/apex/com.android.vndk.v29.pem
deleted file mode 100644
index 3fa6a00..0000000
--- a/apex/com.android.vndk.v29.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v29.pk8 b/apex/com.android.vndk.v29.pk8
deleted file mode 100644
index 16d353f..0000000
--- a/apex/com.android.vndk.v29.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v29.pubkey b/apex/com.android.vndk.v29.pubkey
deleted file mode 100644
index 0b3a0f2..0000000
--- a/apex/com.android.vndk.v29.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v29.x509.pem b/apex/com.android.vndk.v29.x509.pem
deleted file mode 100644
index d5cb172..0000000
--- a/apex/com.android.vndk.v29.x509.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbTCCA1WgAwIBAgIUfJ5jYT22DSbjcfocCKBy9B3v0xAwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0xOTEwMDcwOTI2MzVaGA80NzU3
-MDkwMjA5MjYzNVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAO+EjynTpuY9N/XpnEStnLPe1lQLAly2DhV+dzRw
-qL5fd8aDKClwlT19zjyFoquhxgImNFHTuN9yzVdSS3+eWa9gFGv4cflqInp0rpTv
-sbAFH/EecJ2oN7NQXWCepfB/CdyEiW+ckBG5wdnX/LnEfr6vkDo46dpMGM09nvyA
-OZxHD90yxSXbK+6uGqLaros8WvY/d/KSiXHKUEriSaFOzSDBeZXpLXiCdprkCQqh
-+l4Tn1+Wn7jNLcVCQbwomQywJnGAknI8RCCJVrTxA8c9xEhxLN8zG74J0EwxR0as
-PBjyXgPmcb/rhjv7rMABvJ14uK3UGj3A5pCK3Xi5A2vQ8m5OEcFaii8BZDLvOtnn
-ehya7yX0nofPFafQujfuVXphMAWjmUWeeM3+UumKo4XpXjDXMCy+Q7hroKigRBe2
-sGqI3zlcjBf2nfon+G/dSM9W7YSiZPXxkOnBgsTLZwTmKEksCNYE6/sNigtICTqB
-m8uSEypO2CytdyqelDpk8NYUjaL0M55nXI/DKN48rxy25GSJHgz/fixWlF+/QG+L
-xQJgrzBjfPsVVjkoN9HEWoj5tSOLo7tuWAwMFk1L47EzCBo/O3BhfHntwLpd1POf
-++Rq8UZDMdq2n1iE+i4MhTiKNmg7cCtGLZljvPivTyHAn0Cb0aW6LhWrpOquKbA+
-w3PFAgMBAAGjUzBRMB0GA1UdDgQWBBQQliZlVX7KYmRE+0KV3AKC8PLOYzAfBgNV
-HSMEGDAWgBQQliZlVX7KYmRE+0KV3AKC8PLOYzAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBCwUAA4ICAQDcRJ2S7FgeSnAJPpBxj/CHVSxv9PcSsQAe2KcKg0xY
-uLedy7QqVmpszgBNLlGZ/xH8EHEGYP7WaOMfsRC/AVFLCp8Mq6BKRu9nTdFA02Z9
-XMfkE8zNe/08ScM1UfgMJdaT5/cWLFDuuc335+TnL3dPsEzca2GVMtGKSUtk+9IZ
-H/sZ99mWgxHxhiZYN+6Cy9XlwbfVXT538wVOg/NgUAxX3eh/qijgjopA18FLS79M
-sSCl4dzoILn8hj6fYUzBTvmr1a4+fV3simzwoPekFSLsUho+QXCf2hcpknus/4Ol
-SD4y+8tQmThRCi54XKBQCD8MtG8liq5yRetHZg5MI2/FzbrQofQg9vv69hh8nREg
-iwuL5i9cIOvwUGVT5m+kUhQsjHtq0MtNLY4mAt1DGnRkc6zOGjuzHTSgeHNo45YD
-IgPARXzToGw+G++BG3fCvplSYobVKQifvsaeAbopy3PjsVxmAFIxcUhUGqjvSoOR
-Yxc9UP266j1YM+BWNTZcp93I3yIFnfTC2QxswsmT6/Ltv0r5V97ARGeQT2t7VY0z
-6QhwxbIiwIMYDnQTCqPpeWzUhzK2nGlOg4BVbwa+aMnhFyK2lec8dw2+z82zPmCF
-ZLfJlF6Sl+fy24CqDTeZZeymc28gQx2SnUfCcHJgvEAa2u1ECg0jguPI/Iju9vpw
-pQ==
------END CERTIFICATE-----
diff --git a/apex/com.android.vndk.v30.pem b/apex/com.android.vndk.v30.pem
deleted file mode 100644
index 85808f4..0000000
--- a/apex/com.android.vndk.v30.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v30.pk8 b/apex/com.android.vndk.v30.pk8
deleted file mode 100644
index 699dc5e..0000000
--- a/apex/com.android.vndk.v30.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v30.pubkey b/apex/com.android.vndk.v30.pubkey
deleted file mode 100644
index f4e1d0f..0000000
--- a/apex/com.android.vndk.v30.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v30.x509.pem b/apex/com.android.vndk.v30.x509.pem
deleted file mode 100644
index b085a1f..0000000
--- a/apex/com.android.vndk.v30.x509.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbTCCA1WgAwIBAgIUXOSIxWWptk3TrXtTBeHf1PvZQX8wDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0xOTA5MjMxMDAyNDRaGA80NzU3
-MDgxOTEwMDI0NFowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAM2JTUZORnjZG4NtFyMJV/6XxtjVzTm/ppqLQ9Qf
-tPtWkzolXW7lzWvnmXpfQ1kOqn7/H/lz1CSm69sw0DBvXiIWXZR+8Px5wI10njJd
-Up3CoVLdT9f4w8cfYHq4IZx95O9eARZWDuq3XVgg6P6pNa7f1okJSDV/rH+J4MIV
-P42RI8QjQoGUgVFWs6qRcPKgVoqN2TLifpdCoZFeAbePcIIIJy7+NgeFvohByf3c
-udADr002rYcsTdsLU6LjgSkQo/p6csdnY2ZfmTV95Uj0crW+nlcauTCkMEGmgYEU
-IAAz9FOZQNHTYS92FKXdH3jh7pA6x4awrbjxjWXluAYEUe5qiuWHkDjfslpC2G4H
-CsCzytWz5IVM/lhzMblDtM/BAJ4kV+MmLExp5mGRC1ETH8gZvVx4PMmZXNHrpPZr
-OaW7UaXlS3tKWgnk+h+Sg8KfO7QL4n31a3vvg17U2d0TGvyap1sjhP34upyVX1rj
-ZsZKv+lC0aOQUYNP3d59tc4dDT2At60Zl64Ij5+qcJOoip/TlTa5+3t6RxDc4eQS
-IUij+fSRVJvbAtCUm9n3a0JuuvNPRKrASk9dEgZOe7IlkahH600OSpGpfBMMY70G
-1GgjFCdv/MaFhKO4BGG6P5HzAjE+6UOZ+kKB+GzgA8LKiK8zrdkfBomLg25HMs6i
-pUsbAgMBAAGjUzBRMB0GA1UdDgQWBBRey7EDasVwou6zHd3dSVe0V0015TAfBgNV
-HSMEGDAWgBRey7EDasVwou6zHd3dSVe0V0015TAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBCwUAA4ICAQAB/EdIYWlEbly+W8Q3JK5odYdaeo4Bf2s0Z3njmnux
-5MKzW9qSnW0cy3WBpOEkLmpNMK1ctdi/la4O9qUrW8uCX8d0IvWI7DO+BB2TXQ0N
-RiVs/T4h1djO99UzQYkc+YG9FjFTl/1L0817PIjbHBKEzgdIpMRiwMVb/VxY5/RH
-+WX0P1RYOsHwr6nCcsFqqi5QPjFvkS75RwErh1t5q2ynmUm7IRavfqW+l4GrJRwP
-bEbSNcUOIZRHniVKfqSuvpI9Bclqi3ajLrlx0spOsXUr+TN9oKKdmDAJwv25/vD3
-SKN4jVJHt7XxAOVfX1mvQZUVMFA0iHXTwzFbHW79JaaTy6NBXBprqyS1E2Gk6nIL
-ivJ3ZASiQKzqpmmUVtCLjHnjSiDUuLdBSpCpucHuMSmkhO9ly1Bw1/ep7ZMAsmT5
-/mEvdBmg/9ITGLNwNmM0zutwCd2h9okDf5FxTyq5wwvGcwCmfMzHgr5ANYZsr0sz
-1xn3kTTeg6u9tEUsXCWS7z6oIBUhGvR15fLwDwIcktQ6QSKV3HiUFWTkoPBIZBFl
-HIk9rlC5jIMgJ5IAjjrulztZwdUYosv0e87RI4MTlA62FqwvT0J7zSzp/DutufMJ
-HolIS1WCaGFNuBDqqET1yIgZszeYbEmLDukXGMgcatqRxw14MLdFaDGZoBZlMstT
-1w==
------END CERTIFICATE-----
diff --git a/apex/com.android.vndk.v31.pem b/apex/com.android.vndk.v31.pem
deleted file mode 100644
index 7be0581..0000000
--- a/apex/com.android.vndk.v31.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v31.pk8 b/apex/com.android.vndk.v31.pk8
deleted file mode 100644
index 1956b3b..0000000
--- a/apex/com.android.vndk.v31.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v31.pubkey b/apex/com.android.vndk.v31.pubkey
deleted file mode 100644
index 3db2048..0000000
--- a/apex/com.android.vndk.v31.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v31.x509.pem b/apex/com.android.vndk.v31.x509.pem
deleted file mode 100644
index 1fac038..0000000
--- a/apex/com.android.vndk.v31.x509.pem
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGHzCCBAegAwIBAgIUNs5peki5K2P64dt358pJy7kRtAwwDQYJKoZIhvcNAQEL
-BQAwgZ0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
-b2lkMRkwFwYDVQQDDBBjb20uYW5kcm9pZC52bmRrMSIwIAYJKoZIhvcNAQkBFhNh
-bmRyb2lkQGFuZHJvaWQuY29tMCAXDTIxMDQxMzE1NTYwM1oYDzQ3NTkwMzEwMTU1
-NjAzWjCBnTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJvaWQxEDAOBgNVBAsMB0Fu
-ZHJvaWQxGTAXBgNVBAMMEGNvbS5hbmRyb2lkLnZuZGsxIjAgBgkqhkiG9w0BCQEW
-E2FuZHJvaWRAYW5kcm9pZC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCkcNoRrjQcgtX5R4EuGXfMVCnC8l7FwjB720zze8S38mOI/YPtZCsqeWFm
-SDTpScOAV/0OSqzefWIzRIn2sZPG6kDjhRxRaNifRTEq17MyFH0rnfe2rxNfUNJj
-js5aL9zP07jL8GsDg3h/qPP9m89MGmszty9F8aXSqXg+FZFLtR0whZ1atvTQz1fd
-JYu9+jNhQYz/9ujqtVUh+HkEVj2AZwNNTjQny1g0279gZLd5B1syjwychMm47Bvq
-eWQtmxTXl+sNTgAHqa0/rIUTdSxMk2bLPZdGB2ZyBUPvWf/Pw1dwKjo013skKI9U
-HukTJMhgzvjAZGu5B5kMizkk4zyMraGqvJ6jivIwOG2+5lZKapnzqTewkoTfVRwb
-7ZRXxUjFIRuh234yZlOG80SLKNG2KTB21xnImP9ZuUgZ4Bn80/9l5uLCHPdArGTY
-0xEGNXqlNWrKcJRg4/OhaWU1I67JnUUX8EUdTliGoGQhTBJdBQ5rBmys11OaDVPC
-xQLjc5+3JtXDz4WqQUHeDDjIsgfn60e55/xkjkoUE/Lspi/Cbnae10K0pOArxFXo
-ajOpBNMTHEMmLHz4PHcwNmEymLHHMzT6TXKsXoeHbxQ7b3ispXSxhb45mlLsuae/
-tf6PvqGYXeLBEhXAu9y0FHxK6Ftukhy7Sfk/fSVzte/o2loJGQIDAQABo1MwUTAd
-BgNVHQ4EFgQUTAyOOt24T7PzfBqTtPM7OBkYT/4wHwYDVR0jBBgwFoAUTAyOOt24
-T7PzfBqTtPM7OBkYT/4wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AgEAZpWtqVohh/iaJ/3swLuuqoYy8IZJATAo3Uk/l+3rRrE0QSztEqJQfmblh6ck
-rm9CeAc9YmO0vl9TysSQyiEMawir15G2dHGOfHDpcMopCNyZskr7mk5CjH3k/ArM
-aZjwmYER1sw864RIXNI6ncRIgFfdd6t+5iMOCoePq0EEcE5pzlhmRl+uRf9SmEur
-ibuV+v0uY+T9bvsbDtlJsqZzahDIv9Ahki/bw1RKy0sU+XvzlKAB6WK0zmXiqpl4
-0RHcSL3slJ/jyCIj/YT0Zu/M2zJbt7XzXwpxTK+IKCmfukg02yzHG2EDK71elmxB
-/EFxazQvJ4f4xuzsgovsg6V+qNbg8rgnQcHN53PkmdeWUuBrdzZc7LSn4sTto9b3
-Fdmh54hxrvOz3m0hZZOoJi16cpXcOpUKFWNtiRx+VHc/dGxSd5zWINTOuTD4Fa+x
-BI3zKMBGeBy37rsiLq57cFv7VhCnwaUoU8JUJq66GyrISznqO9DUG2CFza7wqoir
-4wB9jvLt7Cval4/0HAWq75hVdnq8vgGaHygNW3xWm+yY82OqC/op1U2evZgU6NQo
-X7w6WkZIPLVJgsEnWtIqyjAas1VJpqQRavJKES+4e2F+/feN2QtRQ1c+WFhBbBKU
-WT2BgR+Wx2vSOiyY7QZhj4MCsQXZd4UiXeA+mZcRK7JqT8A=
------END CERTIFICATE-----
diff --git a/apex/com.android.vndk.v32.pem b/apex/com.android.vndk.v32.pem
deleted file mode 100644
index 4df6e07..0000000
--- a/apex/com.android.vndk.v32.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v32.pk8 b/apex/com.android.vndk.v32.pk8
deleted file mode 100644
index 50800c4..0000000
--- a/apex/com.android.vndk.v32.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v32.pubkey b/apex/com.android.vndk.v32.pubkey
deleted file mode 100644
index 23db101..0000000
--- a/apex/com.android.vndk.v32.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v32.x509.pem b/apex/com.android.vndk.v32.x509.pem
deleted file mode 100644
index ce12fd0..0000000
--- a/apex/com.android.vndk.v32.x509.pem
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGHzCCBAegAwIBAgIUKANGRnfiiZs43H0o3N3NB5CoC2owDQYJKoZIhvcNAQEL
-BQAwgZ0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
-b2lkMRkwFwYDVQQDDBBjb20uYW5kcm9pZC52bmRrMSIwIAYJKoZIhvcNAQkBFhNh
-bmRyb2lkQGFuZHJvaWQuY29tMCAXDTIyMDIwNDAzMjA0M1oYDzQ3NjAwMTAxMDMy
-MDQzWjCBnTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJvaWQxEDAOBgNVBAsMB0Fu
-ZHJvaWQxGTAXBgNVBAMMEGNvbS5hbmRyb2lkLnZuZGsxIjAgBgkqhkiG9w0BCQEW
-E2FuZHJvaWRAYW5kcm9pZC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCm4OYb46VgT8WSmjJonHxwfrpbU0K43lnd2l8fg1OsGhIYYokFkVUskHGd
-774uCTiLl2Ky9dqsilRN6DBQJjnWdChbg0zliivV9rVi8Pk0wEpPJVaNDM8tVlYy
-ECpNZcbl78huiT5awLi0wLDZQsMMC7sE9PPF2YOeFzuT1Z0APA2tjCGWIjJ5tXXP
-x6ODRk7TW4ju6Xmyi6gm98pjybfqSvSy9Gnsf6cPFHKhW+AQPKRpAJ3dAX3dfq9F
-mk+j8YnXVVc94W+5/fPp+XPvITQv0lFQreDZss4L7Z+10bysmpEfEz2Pp1JXCr50
-FhkP4cKjzKSmQxQQhn41MbUUh+TXGEjF6aDP2ciCweuyYPSMm/1ozgEADUrFdctf
-deXFWac9SS91s//RU/PRB5nZWw3C5ahzJUZytG6r4LLQ4OcHdNJrGYT5NGlVfJiu
-lsV66ckH5bvQkAqhQyhkhQ/gRuep1bjuB61S6Mmg9Rk2GNcPH8rER7zBwj4cef8l
-SBlMaYZnP5usN0FGIa9Vu0skpJoybKp7KoO0SEBE4kssrENM78/f7fszSR3y7duw
-qw0cDLDudpSaGAclDvl5g+S8o0uv0pXNnnzs2OitU2TD1yNJ3OQp5sd5zllqb8D+
-b1wvtaVRoxmiO8e3l+xZGbHlAq93mhDtZlb4DfRzHrSUBauYzQIDAQABo1MwUTAd
-BgNVHQ4EFgQUwNwc6HLUguxPTJR0PT0bqZLLcjwwHwYDVR0jBBgwFoAUwNwc6HLU
-guxPTJR0PT0bqZLLcjwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AgEAAhtni4wv2cL3tNmZJKGUmErZ19tB1GXVom5d4eYkodVMbGx7oMTMSy5zoTv/
-pVWKFI1+vZrWY4g5oyEqY+/pAVogUAP76xcI5Q8NQGkB4iThKWGYnBSItzIhV1aq
-QNYF13b6pBreRNILY3obLn5ZdO7HOYOTTzbl3iGaAIwlCRoHMEZMg4K7KSRlRZiZ
-TAfqeZH3BMYFmjMMiD9KbU11qWe9PLnyQnQv9Bru6kun6PloUsqOQXBLcaNEE8jG
-To8mgvJxymaW3jrBgBD76P+NIhFKQYfGFVopTBDKfPwi4fSYmxM8V4ll799uwbWF
-aUFCqkuVsfX6ZVBr16AFUBHBEhyv3AJ85HVkCOHk+LuhqyJHXwWyWK6IiHMDISX0
-9dta8LL+GHfkkoMVujBigbs4R0LROWX9WBIOWnY+jLJO0J2CTwZfZ7T3y8g0YSlo
-ofAxjau7rDtoOnCa/3AX31jAN+Zu01HIBI1DXBj4mTaIvDb2zajo51W/xlgAFOfG
-0QLg5UY8Mpsvmxmfvz1gEXFmreqFAkQ2fBNZ0SrmgwPSyitjuYWsMTJVxk9HeLoR
-w+Zc1kZUbAHceaKWUtHsHP1/PFIDZio/26DkNB6bzXAXomf9SwtM8L7qKH0VRqDB
-8XqeVLnLnqgDanQvCU0lRCrcAPP9p+jokcj9AWGTEkwBJdo=
------END CERTIFICATE-----
diff --git a/apex/com.android.vndk.v33.pem b/apex/com.android.vndk.v33.pem
deleted file mode 100644
index a952b99..0000000
--- a/apex/com.android.vndk.v33.pem
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/apex/com.android.vndk.v33.pk8 b/apex/com.android.vndk.v33.pk8
deleted file mode 100644
index 2185c01..0000000
--- a/apex/com.android.vndk.v33.pk8
+++ /dev/null
diff --git a/apex/com.android.vndk.v33.pubkey b/apex/com.android.vndk.v33.pubkey
deleted file mode 100644
index 4ef7164..0000000
--- a/apex/com.android.vndk.v33.pubkey
+++ /dev/null
diff --git a/apex/com.android.vndk.v33.x509.pem b/apex/com.android.vndk.v33.x509.pem
deleted file mode 100644
index 49f645e..0000000
--- a/apex/com.android.vndk.v33.x509.pem
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGHzCCBAegAwIBAgIUT776g8b5ylngHIv1zn7h/CDgJ+wwDQYJKoZIhvcNAQEL
-BQAwgZ0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
-b2lkMRkwFwYDVQQDDBBjb20uYW5kcm9pZC52bmRrMSIwIAYJKoZIhvcNAQkBFhNh
-bmRyb2lkQGFuZHJvaWQuY29tMCAXDTIyMDYwNzA2MDEyMloYDzQ3NjAwNTAzMDYw
-MTIyWjCBnTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV
-BAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJvaWQxEDAOBgNVBAsMB0Fu
-ZHJvaWQxGTAXBgNVBAMMEGNvbS5hbmRyb2lkLnZuZGsxIjAgBgkqhkiG9w0BCQEW
-E2FuZHJvaWRAYW5kcm9pZC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCZYHiZqo6oAiJiR/mZo6+p6cnjfxLXx4khOhROsS0o1D2IV/Gq/dxhFyYc
-2k9IeIA2chyxZJaVx4LyMnDZ1df97/1LVsFHMk6F5iKs6p2+4dWcMSuvn5L4+Tuf
-wT+h+2KfbpPJpqPEWSmI9VsUp1V10OmxuRELx/kJHQID6IAYiiEVoXHtE1pAO2ip
-NLWXlpVmImGZBr7vPGbLBw+ud3agBLqB3y5jhsUeHseM6uvEbsS2Cd9VJUGK321v
-jsj64pduJdkGOiQBGvS0CwGQjpA3XtlgQUnmUCwramnRW882crsAK9tDMAlQsHdC
-joMH5Umhs7j3wRc5mn4cCjCUzJqK4QwNAKOTrDx9uOwT/Ic5c+h60hOCuk85+Itv
-n79BTbigvanEFwvgur71EJVsaxlXLxJ1xq4IzLpYwW0ty7SErEUXzeJ5kxEgQtNf
-zxxpH8CCSNrLVWkMM4V4wHeKv3C8SHV0hMsxiyIeMJOd/jQ5vC7HTO37gCjuhvOp
-64YGITbW2JDBFMGpBGtiUX4ujosgnBan21SCO+Ws6bKzCzkFgNPNFSrqimer0UK3
-5gQSRQ5YZdytyx5ZoTUKc2KTZ0GeOCUDo/1NSGQLcbZXcJd+/rjVIO+ZyjV0PIUb
-V0NYLWG7Nm+RW14vIg5wP9YdvdHZ4hnApiDDD2aeQBrIchEeuwIDAQABo1MwUTAd
-BgNVHQ4EFgQUdb99aEm8AfYdB+HhqHgshGxSOh8wHwYDVR0jBBgwFoAUdb99aEm8
-AfYdB+HhqHgshGxSOh8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AgEAYd1AQtRiHuUmkvZx4XZ6YnqLEqxqPbf5Z15WJiwgk6xET14bTMEHd2l/qNOq
-rAoxmuyTxWG+OvBpTKBbhftd44xRbg7vF/VX+5LHOcDXpNzLr6JaLMkjR/r63gh5
-8e21WVN1CPqNMqlUHz9ycGTOp/fVh2mRS1kyuBMO742aGtbowlS7otvgdKh8LHxc
-8MRAoJe8ofwQq4nCYAoW8oJ9mnhavSdOGfItxjg62SJGNDMCH/NNPMg1KGpAenlS
-0YZVEZyirJLJtnf4mBdeyLqZMtAWwwTDTAbISu+1YU1BgKCHcQJ/6fdg8iQ/remo
-P8o2HiyUx07Wq5CUFdlIe3y7yW8OYSDkFQa5Gjwh5xoun0icgUjbx8EcxJ04L9Bo
-UEAJJT63XmpjFK7KEM9FBqO6VvXtZlgfgRHRB3wum8mUhPTRgdgKgvs+lBfuHsJA
-Kp5CN5T4A1HZTUHbOGf2iR3ODn6R5DIW5AqcK5KfHvRPcQWRy2JQgYobjtfNJ6fS
-R+xe5O6LJVzQ1cUx2u8Z063Kok1NyPRYoswRdH+GmtfOHRx+RlJVDnAPTrAgtV1S
-Ebo15xkXy6vy0yAoVSZdgLtQaI/6tZXWi8I06I5CWD2X3zbbKd9Ze+nF0YAm2KfF
-Na+CCwOFNmBHceqs6+1SAibch4R5b04S8qi8nXltUvgYH44=
------END CERTIFICATE-----
diff --git a/apex/com.android.vndk.current.x509.pem b/apex/com.android.vndk.x509.pem
index a6e9352..a6e9352 100644
--- a/apex/com.android.vndk.current.x509.pem
+++ b/apex/com.android.vndk.x509.pem