Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."