Merge changes I089c65ab,I0efe81e0 am: ed11470364

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

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