Merge \\\\\\\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\\\\\\" into...

Merge \\\\\\\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\\\\\\" into klp-dev am: 3242dcf6 am: f4ad14f1 am: e3c1c2d7  -s ours am: a2f91257  -s ours am: da2ac348 am: 8635613b am: d88de681  -s ours am: 02aa5b7f am: 1a05bc6c am: f48edac5 am: 4f71c20b  -s ours am: 839f3636
am: 7ebe84bc

Change-Id: I3d115fb71ce97ff0fca90f8613a2b05b60232cb7