Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am: 3242dcf6e9
am: f4ad14f154

Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450