DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1
am: 340f678953

Change-Id: Ie26fa73b8cddde28e276efccb6dff544bd662542