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

Change-Id: If77ce0dcb5192ef3b833aee68be0739d440d805e