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

Change-Id: I21ffabfdd04bdec23859bf3f8ae8f790307d42e3