DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2 am: 28e793c11b  -s ours am: 43151ef3a7 am: 5ef3403fdc am: ee465dd72e am: 166e6f50cd
am: 15ef7f184f

Change-Id: If62f2f76a26f432c48f0e323195839eda1f40f0f