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

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

Change-Id: I6bf7f7f298efb36ddbb95efc2ced221b3bc9bfe6
Signed-off-by: Automerger Merge Worker <[email protected]>