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

Change-Id: Ifccba29a49c395e7ab81412c3e22b8feafd7c2e6