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

Change-Id: I7e4df7a200ec1a9945e9371bedacbc880fb9c7cb