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

Change-Id: I7cf50f96b90c573d437becb478adce718a1d193b