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

Change-Id: I512b4df1b87f9be715896f418fd7618d3d234e82