Merge \\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\" into lmp-dev am: d5573715d8  -s ours am: f2fffc9fd0 am: 047fb889cc am: 9f7ef49df4  -s ours am: 426708f0d8
am: 5affad8fc5

Change-Id: I1425a3088abbbcffca2af9f8533b6168febb6ec4