Merge "[PM] Compile libs for both archs" into main am: e15ab5e20c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2996378

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