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

Change-Id: I8f7f2b98145c76b2904a0ef57651214e6881aac5