[automerger skipped] Merge "C2SoftVpxDec: Replace CHECK() with error handling"...
[automerger skipped] Merge "C2SoftVpxDec: Replace CHECK() with error handling" into rvc-dev am: 221055a1 -s ours am: 4aea32da -s ours
am skip reason: Change-Id I1fe0be54f9910fd98ff4db9240b4dcfd09888ffb with SHA-1 dbaa9bc0 is in history
Change-Id: I138d84328874090e47b2d69ebe02b37d061ff01f