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

Change-Id: I0c7f5be17d2359b361719dc627488461c1fac860