Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"