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

Change-Id: I64f12a9e394494210dda99b16a3ce63149049d23