Merge "Remove VNDK definition(s)" into main am: ab7d809ff1 am: 183235e621

Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/2994437

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