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

Change-Id: I322a90d7a9881d88e84ebf2ed3986eced76b88ec