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

Change-Id: I6850faa8b803654a47fd7c4f9e661e16cf272ec6