Merge "Update the libc kernel includes to support the newer mman for KSM support"