Merge "fix(libc): memset inclusion to libc makefiles" into integration