ObjCARCOpts is already included by ClangCodeGen. Linking it again causes the error in PR22543.
While I'm at it, fix a related problem in lldb-server.
Bump. This is a minor change without which LLDB is totally unusable when built with Makefiles. Should I generally just commit these kinds of things directly? There's also D5431, which I'd like to get in.
We don't use the makefile build, but it looks pretty safe. I say just go ahead...