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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2996885

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