Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into mnc-dev am: 3453aa5e56 am: a61a5efe18 am: f7e6f6965f am: f1a04523af  -s ours am: 8564846bd6 am: a74887f583 am: 60ecd3e7be am: d2e667afb7 am: 93bf6d68fa
am: 876512e43c  -s ours

Change-Id: I100eeecaea692c647d07ef289da64b170837c26d