DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7 am: c3819cfda9
am: c696d76d98  -s ours

Change-Id: I80f50a474af40a2ea3c732604e77caef6afadf46