DO NOT MERGE: defensive parsing of mp3 album art information am: 52d02b97a4  -s ours
am: d4bce2cc70

Change-Id: I4bbe609b4fd188182305136c7005fc5aebf33827