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

Change-Id: Ifa3581fedd391417e61ad9f576023b8f9e590ea4