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

Change-Id: Ib866c2f9b1a3bf5081965fd1b2a3398431ffe678