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

Change-Id: I703a66740fa0179203aa96c89caafab2b3fecef6