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 am: 1a05bc6cca am: f48edac5c4
am: 4f71c20bcb  -s ours

Change-Id: I48f9f11f9bafe1fe6fa4dd6483031ef6f61bb76a