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

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

Change-Id: Ia94d390369a1aaad5863ee4739b8af58c5528650