Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into lmp-dev am: d5573715d8  -s ours am: f2fffc9fd0
am: 047fb889cc

Change-Id: I09b46561d6490b0693e0f37e3b770a50de2b82f2