[automerger skipped] DO NOT MERGE SoftXAAC: Handle errors in xaac decoder plugin am: 5fb63b5437
am: 993f7904dc  -s ours

Change-Id: I427348b5a469bf1dd5d8d4cdbc93f0cfb38d0b0b