Merge "clean-oat should remove intermediate oat files" into ics-mr1-plus-art
diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc
index 9e2c33a..598a8b3 100644
--- a/src/compiler_llvm/compilation_unit.cc
+++ b/src/compiler_llvm/compilation_unit.cc
@@ -141,7 +141,8 @@
 
     irb_->SetInsertPoint(bb->getTerminator());
 
-    using namespace art::compiler_llvm::runtime_support;
+    using art::compiler_llvm::runtime_support::TestSuspend;
+    using art::compiler_llvm::runtime_support::GetCurrentThread;
     llvm::Value* runtime_func = irb_->GetRuntime(TestSuspend);
     llvm::Value* thread_object_addr = irb_->CreateCall(irb_->GetRuntime(GetCurrentThread));
     irb_->CreateCall(runtime_func, thread_object_addr);