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

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

Change-Id: I131740fdab47519913fd840e3ccc778e04dd8427