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

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/2997159

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