am 1e357f46: am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."

* commit '1e357f4610e788c3e5dea5dd2f01b26bb75c5e36':
  Correct ID3::StringSize calculation for UCS-2 data.