Merge "C2SoftAac: fix error handling" into pi-dev