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

Change-Id: I534362c8ac08d793e2e9b19190a3091c252edc66