252e437cc4
This reverts commit ee45468c22.
Reason for revert: Segfaults occurring with 64-bit devices (B1 and C1) with the latest changes. The error condition points to SEGV_MAPERR, which combined with the build diff, leads me to believe this change caused the issue. b/123559319
Change-Id: I5255e14f74e2be229ffd8cd0765ca61a2a074139
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