am e680491e: am 1efe46de: Merge "Fix id3 parser crash"

* commit 'e680491ef752256d0d0d39fc77cd7495e580adea':
  Fix id3 parser crash