Fold in out-of-source test build adaption changes.