Merge "Build changes necessary for LLVM 3.5 switch."