DO NOT MERGE: defensive parsing of mp3 album art information am: 52d02b97a4  -s ours am: d4bce2cc70 am: 64e37f54f5  -s ours am: 5aa1034968 am: c20fe545fc am: ae44650731 am: 572c3ddcc9  -s ours am: 955d03d798 am: 0806da1ab5 am: 9735865224 am: 2fdea08e32
am: c078d8d15e

Change-Id: I42ea3fc5c0c1cf94b9e125c961ced05eb64478b3