Merge "Fix pkg-config file to pull in libm"