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

Change-Id: I5bc5911572683600fdf8265db14f9677f3519e73