Merge "C2SoftAvcEnc: revert flex YUV handling"