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

Change-Id: Id552f916abde593005d0c1060f82ec1dc5945751