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

Change-Id: I51138ec1676f8e8d886aea588a2f38a68bb3983e