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

Change-Id: Id2544b96d8a262edcded291a0c6d37a510c6b0fc