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

Change-Id: I46c20fe2e408abdd03a199d237c066eb672bc4ba