Remove trailing whitespace
Make CFG_LIBDIR configurable. Fixes #5223
auto merge of #11045 : jhasse/rust/patch-libdir, r=alexcrichton

See https://github.com/mozilla/rust/issues/5223#issuecomment-30455086
Renamed Option::map_default and mutate_default to map_or and mutate_or_set