Merge "NDK library: remove remnants of abidw usage" into main am: a5e9abe7...

Merge "NDK library: remove remnants of abidw usage" into main am: a5e9abe7 am: b671cc0a am: c16cba68 am: 3d4cf450 am: e79b996d

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



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