DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260 am: b820fe865a am: a064916d90 am: c63bbf90f9  -s ours
am: fd9ec48bcb

Change-Id: I248499fce25c6d06ea7a274c267e2ceac7cfd7ad