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

Change-Id: I102da4bbcb3ed4e1363121b4ef8e732aab2c8e78