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

Change-Id: Ib71918ef91b50ec3a7b93b6c40e0af18df9fc5d2