No longer allow the -std options to entirely override the -x language option. This allows -x cuda -std=c++11, for instance.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@209824 91177308-0d34-0410-b5e6-96231b3b80d8