Merge "Remove NDK exports" into main am: 8672d4c48e am: 821b6716dc

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

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