Merge "C2SoftAvcDec: revert flex YUV handling" am: d5238c466f am: 79754e1f4f am: e1c72958bd

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

Change-Id: I0ff7095c3103e6e0d71995f90c7018aa8003179d