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

Change-Id: I44e5aa788fb779217bc072a4d6e5ce1dac973c33