DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2 am: 28e793c11b  -s ours
am: 43151ef3a7

Change-Id: I814093cd6e110f9eda51f3243def7aa93ca363d4