DO NOT MERGE: defensive parsing of mp3 album art information am: 21f2814260 am: b820fe865a
am: a064916d90

Change-Id: Ie8dd560bade018ef1037f619d5b95af39eba9a0f