Merge "C2SoftAac: fix error handling" into pi-dev
am: 829d4349a9

Change-Id: Ib0f83179fa2f2bc81d9ee76cfba485297c7d31e8