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

Change-Id: I864307c871b8ab48fd0fe2ddaba2e6ead0f0233a