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

Change-Id: I955c6915c69f451b9cce8c9e44ee9c5f1e413b90