Merge "Bring forward libc/libm/libdl definitions."