Merge changes to clang's Driver code into LLVM's Option library