Merge commit '7b3002e8bcafdcf811b4ca5aff8524805679b32f' of sso://googleplex-android/platform/external/libopus into HEAD
Change-Id: Ie54d701c1e551a62aa4b277c8d874b83e874557f