Merge "C2SoftVorbisDec: Fix memory leaks in multiple headers case" into mainline-prod