Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into...
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into nyc-dev am: b569c541 am: 583a9e26
am: 7f1c9732
Change-Id: I64f12a9e394494210dda99b16a3ce63149049d23