Simplify/generalize code for finding library paths.

This is to accomodate multi-arch on Debian, as well as other situations
where the built-in computation of lib, lib32, or lib64 isn't what we want.
Undo unneeded include
Remove a commented-out include