Merge "Revert "mp3dec: Fix out of bound read error"" into mainline-prod