[Sanitizer] use fully qualified type for placement new replacement

llvm-svn: 158706
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
index 4dd71ae..f133a6f 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
@@ -20,13 +20,13 @@
 
 namespace __sanitizer {
 #if (__WORDSIZE == 64) || defined(__APPLE__)
-typedef __sanitizer::uptr operator_new_ptr_type;
+typedef uptr operator_new_ptr_type;
 #else
-typedef __sanitizer::u32 operator_new_ptr_type;
+typedef u32 operator_new_ptr_type;
 #endif
 }  // namespace __sanitizer
 
-inline void *operator new(operator_new_ptr_type sz, void *p) {
+inline void *operator new(__sanitizer::operator_new_ptr_type sz, void *p) {
   return p;
 }