Merge "Calculation overflow in NativeCodecEncoderTest" am: 13b3f6774f am: f1c2e2a441 am: 994522295d

Original change: https://android-review.googlesource.com/c/platform/cts/+/1468867

Change-Id: I0828426045c0b87361eff92b1bb34bc8af688205