Merge "Fix signed integer overflow" am: 9943091884

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

Change-Id: I2875c3f199a57e98bb5ab67b39ea10d40eae0773