Merge "Ensure extracted JNIs are stored properly in APKs" into main am:...

Merge "Ensure extracted JNIs are stored properly in APKs" into main am: a7c5278f am: 928eacca am: 1c7fe15d am: e593e46b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2681735



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