Merge changes I089c65ab,I0efe81e0 am: ed11470364 am: dab4d03324 am: a80a2bfd60

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

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