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

Change-Id: Iddfa06104c9d41d7627efdb2aa970e10b5a1c81b