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

Change-Id: I64c9657a66aa2e818ebc002af31591e6db51907d