DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260 am: b820fe865a am: a064916d90 am: c63bbf90f9  -s ours am: fd9ec48bcb am: 68641e10b9 am: 66f96ca94a
am: 7fce9824c3

Change-Id: Ic6e01a4e3ac0b52193e7c171dbe84d608bf25158