Merge "C2SoftOpusEnc: Fix integer overflows leading to crash by changing data type" am: dfbe9408a7 am: 471e5997b7 am: 619ef7fb51

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1970719

Change-Id: I6d242af7b699f02e7a5b260b03820e4077becf4a