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

Change-Id: I2b39bc0d45895d5540a6e6174f73f8386480caae