Unbreak build by making the build of renderscript again conditional on BUILD_RENDERSCRIPT until we can figure out why the build servers see an error that does not reproduce locally.
diff --git a/Android.mk b/Android.mk
index d24a92c..6b11a25 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(BUILD_RENDERSCRIPT),true)
+
LOCAL_PATH:=$(call my-dir)
@@ -103,13 +105,10 @@
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libui libacc
LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libRS
-
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
-ifeq ($(BUILD_RENDERSCRIPT),true)
-
# Include the subdirectories ====================
include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
java \