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

Change-Id: I15f4f8a0864d8c6cdbc8ee67ef191e37452261ae