Update prebuilts and rules to fix build.

Change-Id: I466dbcc6439b93984e25a073543587f99fbf2cef
diff --git a/renderscript/Android.mk b/renderscript/Android.mk
index 2bc9c5d..c269261 100644
--- a/renderscript/Android.mk
+++ b/renderscript/Android.mk
@@ -21,6 +21,17 @@
 ##################################
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := libcompiler_rt
+LOCAL_SRC_FILES := lib/$(LOCAL_MODULE).so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+
+include $(BUILD_PREBUILT)
+
+##################################
+include $(CLEAR_VARS)
+
 LOCAL_MODULE := librsjni
 LOCAL_SRC_FILES := lib/$(LOCAL_MODULE).so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
diff --git a/renderscript/lib/libcompiler-rt.a b/renderscript/lib/libcompiler_rt.a
similarity index 62%
rename from renderscript/lib/libcompiler-rt.a
rename to renderscript/lib/libcompiler_rt.a
index f375cd4..c467b05 100644
--- a/renderscript/lib/libcompiler-rt.a
+++ b/renderscript/lib/libcompiler_rt.a
Binary files differ
diff --git a/renderscript/lib/libcompiler_rt.so b/renderscript/lib/libcompiler_rt.so
new file mode 100644
index 0000000..5ee8ccc
--- /dev/null
+++ b/renderscript/lib/libcompiler_rt.so
Binary files differ