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

Change-Id: I5a1d3e49a82b031a74d48396ee719410d8e6a09a