Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734  -s ours am: a2f91257fd  -s ours
am: da2ac348fc

Change-Id: I6d0517817b12073b3ce93dcfe14626399770a1fb