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

Change-Id: I018c8bedc4d810b7abca34ff4273e249ebc0648f