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

Change-Id: Ied8936092f890fcd213548690cdc591de2af15f5