This reverts commit 96a8ccd4a1.
Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed
Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
The libwvlevel3.a static libraries under the different platforms were made with OEMCertificates with the following SYSTEM_IDs:
arm: 8158 arm64: 8159 mips: 8160 mips64: 8161 x86: 8162 x86_64: 8163