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
am: 413a8d2925  -s ours

Change-Id: Ib08bce966ca73e573003303c781b27698c450eb0