DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7 am: c3819cfda9 am: c696d76d98  -s ours am: 1e036d883e  -s ours am: 8326a5bd4f
am: c7bbcd1bb8  -s ours

Change-Id: Ic4cdb51567e719b1c44788f8e688df3e55797c56