Update llvm-rs-cc build to use unified headers in all cases.

Change-Id: I66a2cc5f762b7d170f4bfc6c88f8c7df11be4f4b
diff --git a/core/java.mk b/core/java.mk
index e726bb0..38fd6f2 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -160,8 +160,8 @@
 # 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 \
+    $(HISTORICAL_SDK_VERSIONS_ROOT)/renderscript/clang-include \
+    $(HISTORICAL_SDK_VERSIONS_ROOT)/renderscript/include \
     $(LOCAL_RENDERSCRIPT_INCLUDES)
 else
 LOCAL_RENDERSCRIPT_INCLUDES := \