Merge "Correctly set the linker search path for libm and libc."