Merge "Adding plumbing for passing the lib directory."