Merge "Correct ID3::StringSize calculation for UCS-2 data."