Changes to move to jb-mr2 based llvm

Change-Id: Iae8b2164f25146807662a6025a254fec6d40bb52
diff --git a/src/compiler/llvm/gbc_expander.cc b/src/compiler/llvm/gbc_expander.cc
index 2ae77a1..24f2032 100644
--- a/src/compiler/llvm/gbc_expander.cc
+++ b/src/compiler/llvm/gbc_expander.cc
@@ -33,8 +33,8 @@
 using art::kMIRIgnoreRangeCheck;
 
 #include <llvm/ADT/STLExtras.h>
-#include <llvm/Intrinsics.h>
-#include <llvm/Metadata.h>
+#include <llvm/IR/Intrinsics.h>
+#include <llvm/IR/Metadata.h>
 #include <llvm/Pass.h>
 #include <llvm/Support/CFG.h>
 #include <llvm/Support/InstIterator.h>