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

Change-Id: I61c21e0f434c91aff85c863e50cd297cca0efb02