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

Change-Id: If5670ac1cde5b28e1993344176682e6479932aa5