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

Merge \\\\\\\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\\\\\\" into lmp-dev am: d5573715  -s ours am: f2fffc9f am: 047fb889 am: 9f7ef49d  -s ours am: 426708f0 am: 5affad8f am: c8950e29 am: df83abca  -s ours am: b6b00fc6 am: 5d441728
am: 96567286  -s ours

Change-Id: I809c71ddfbf4b1591b977756529c53492b13b9af