Merge "Fix trailing garbage after UCS-2 encoded strings in ID3 V2."