Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into mnc-dev am: 3453aa5e56
am: a61a5efe18

Change-Id: Ibd58bb301d4bebe565e79446f651849c83447345