Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into mnc-dev am: 3453aa5e56 am: a61a5efe18
am: f7e6f6965f

Change-Id: I12bca17f2e86392db45764041c3d49a3c9902c7c