Fix ifdef-related differences from upstream LLVM.

Change-Id: I207500ca8b24afaa976077771cacb20d28a8a31a
2 files changed