Merge "Remove VNDK definition(s)" into main am: fdace49fcd

Original change: https://android-review.googlesource.com/c/platform/external/libcxx/+/2997337

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