Merge "Remove VNDK definition(s)" into main am: dab0bd0457 am: cccea88751

Original change: https://android-review.googlesource.com/c/platform/system/media/+/2994441

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