Merge "Always convert ndk_library" into main am: 02f22119 am: 5c4debfc am:...

Merge "Always convert ndk_library" into main am: 02f22119 am: 5c4debfc am: 65613d55 am: bf9f6584

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



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