DO NOT MERGE: defensive parsing of mp3 album art information am: fa0806b594 am: 1e9c67e52b
am: e78bb7ab20

Change-Id: I670745ce36d65e53b80ae0ebcac2c03e763bb6cf