DO NOT MERGE: defensive parsing of mp3 album art information
am: fa0806b594

Change-Id: I4e290d41367367102a82988d94f80cf53c35e932