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

Change-Id: Ia455a6018aefb9192b6c2195273fc04dce70feeb