Merge branch 'upstream-master' am: e2bcf2c247

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

Change-Id: I65516f06c988b96a85b631709ee3efa7436e200b