Merge branch 'upstream-master' am: e2bcf2c247 am: 7a87b356ef

Original change: https://android-review.googlesource.com/c/platform/external/libopus/+/1443636

Change-Id: Ifc4a264022c68b0bd6a20ab7568ce6c983439fe3