DO NOT MERGE: defensive parsing of mp3 album art information
am: 52d02b97a4  -s ours

Change-Id: I6951ac809d45ac97e3f6d57ec6c978b086dc1f31