diff --git a/lib/Renderscript/RSInfo.cpp b/lib/Renderscript/RSInfo.cpp
index 9d924ca..5bca5e6 100644
--- a/lib/Renderscript/RSInfo.cpp
+++ b/lib/Renderscript/RSInfo.cpp
@@ -251,6 +251,7 @@
       ALOGE("Out of memory when allocate memory for string pool in RSInfo "
             "constructor (size: %u)!", mHeader.strPoolSize);
     }
+    ::memset(mStringPool, 0, mHeader.strPoolSize);
   }
 }
 
diff --git a/tools/bcc/Main.cpp b/tools/bcc/Main.cpp
index 5b2fa83..8426430 100644
--- a/tools/bcc/Main.cpp
+++ b/tools/bcc/Main.cpp
@@ -180,10 +180,8 @@
     return EXIT_FAILURE;
   }
 
-  llvm::MemoryBuffer *input_memory = input_data.take();
-
-  const char *bitcode = input_memory->getBufferStart();
-  size_t bitcodeSize = input_memory->getBufferSize();
+  const char *bitcode = input_data->getBufferStart();
+  size_t bitcodeSize = input_data->getBufferSize();
 
   if (!ConfigCompiler(RSCD)) {
     ALOGE("Failed to configure compiler");