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

Original change: https://android-review.googlesource.com/c/platform/external/speex/+/2997436

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