Merge "C2SoftAvcEnc: revert flex YUV handling" am: 81325ec2e4

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

Change-Id: I3b5a8716962ce1b37f0d46f6830f421110718ad2