Merge "Prevent crash for malformed ID3 COMM frame"
am: 944706f468

Change-Id: I73e84de9a7f3d9ce5a1bbfbf99bd21c610662c4c