Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours
am: 36f3126596

Change-Id: I4692e709879129aa80766ce093b18f6b6f71c1ec