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

Change-Id: I601737a43f54be37d5e8395cfa738fe35692cbe7