Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
am: 3242dcf6e9

Change-Id: I09c381c92c7efeacc95c611b2775d875a6202027