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

Change-Id: Ic0f6897b160d0c52fa9bb9c0d980a44b925e1b13