DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538...
DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538 am: c3819cfd am: c696d76d -s ours
am: 1e036d88 -s ours
Change-Id: I72ef099cc16c44823320453729da9c036d7fdca8