Merge "C2SoftAvcDec: revert flex YUV handling"