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 am: 4978d974e2 am: 3075424b2c am: 1e9da27e4f am: 5ccc36c8d3  -s ours am: a34b0f7e5c am: 6f2bd89626 am: d5bc59b38f am: c18deb4339 am: 50c3f9756f
am: 2d588e6356  -s ours

Change-Id: I9349e487183444a9158a5ae6a7cc6bbb65ff7f7d