Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into nyc-dev am: b569c5411a am: 583a9e2636 am: 7f1c9732e0 am: 3d2f33d3c1 am: ebffd8cd4d
am: 16ed9f23c1  -s ours

Change-Id: Icb8ab57dd3ba9f222cb160bf073d433e617188b5