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

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

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