Merge "C2SoftAac: fix error handling"