DO NOT MERGE: defensive parsing of mp3 album art information
am: 5759c46d84

Change-Id: Ic50efe3ee2fc52ae3cf227d893723f1d9095dac5