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

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

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