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

Change-Id: I0c5e6c1a4a36a345b87565c91e692871ed2895f2