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

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

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