Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev