Merge \\\\\"SoftMP3: memset safely\\\\\" into mnc-dev am: b2b56d1f0a am: 5d6fe83821 am: 2d09be5831 am: 3c69172940
am: fd778b20ed

Change-Id: Ia0048bd1d37ec1c670b184f40423389884a982aa