Merge \\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours am: da2ac348fc am: 8635613bf3 am: d88de681cd  -s ours
am: 02aa5b7f31

Change-Id: Ia3b3ae9337fc4418666c8ab96a4366bba846f6e4