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

Change-Id: Icae09d633f332f5488ecfea318c8ac9a0937cef6