Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp

Index: lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
diff --git a/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp b/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
index 444761c7f5aa0f5c14b3039d9aa6f2ef3f97b53d..bdc7eee99ec70e68711cb6e4757647a3ad808039 100644
--- a/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
+++ b/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
@@ -250,8 +250,6 @@ void NaClValueEnumerator::EnumerateValue(const Value *VIn) {
   if (V != VIn) return;
 
   assert(!V->getType()->isVoidTy() && "Can't insert void values!");
-  assert(!isa<MDNode>(V) && !isa<MDString>(V) &&
-         "EnumerateValue doesn't handle Metadata!");
 
   // Check to see if it's already in!
   unsigned &ValueID = ValueMap[V];