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 am: 5eaa9d22bc am: 6e7c0efb9e am: 54c7cd959f am: 5c9ef550d5
am: 1ee2b92fe5

Change-Id: Ifb8f143bde7a0c846616dabd4f8516a458fb7277