diff --git a/core/java.mk b/core/java.mk
index 949af3ce60..0397debe7d 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -136,17 +136,24 @@ RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp
 renderscript_intermediate := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript
 
 # prepend the RenderScript system include path
+ifneq ($(filter-out current,$(LOCAL_SDK_VERSION)),)
+LOCAL_RENDERSCRIPT_INCLUDES := \
+    $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/renderscript/clang-include \
+    $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/renderscript/include \
+    $(LOCAL_RENDERSCRIPT_INCLUDES)
+else
 LOCAL_RENDERSCRIPT_INCLUDES := \
      $(TOPDIR)external/clang/lib/Headers \
      $(TOPDIR)frameworks/base/libs/rs/scriptc \
      $(LOCAL_RENDERSCRIPT_INCLUDES)
+endif
 
 $(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)
 $(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)
 # By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be
 # automatically found by the java compiling function transform-java-to-classes.jar.
 $(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate)
-$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LLVM_RS_CC) $(LLVM_RS_LINK)
+$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LLVM_RS_CC)
 	$(transform-renderscripts-to-java-and-bc)
 
 # include the dependency files (.d) generated by llvm-rs-cc.