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

Change-Id: I4f61f9cd23c63ee2378c92668de9bebd853734be