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

Change-Id: I671be79b038e690d5f9b17f7299371010c93f5e5