Merge branch 'upstream-master' am: e2bcf2c247 am: 7a87b356ef am: 0dc8a539d8 am: 57e7bcb6ae

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

Change-Id: Ia90d17e408053cafc23bcdfaf3cf509925b3c764