Merge "versioner: Use llvm::opt::ArgStringList" am: 969538db2e
am: 0af7f684de

Change-Id: Iea2f62cb759edfdbc108baee5d8e6c8c7fcde635