Renderscript: rename .rs extension to .rscript

Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Exempt-From-Owner-Approval: Clean CP
Change-Id: I88b87b253ddb63ba4a4946d185ef76a553ba6fee
Merged-In: I88b87b253ddb63ba4a4946d185ef76a553ba6fee
(cherry picked from commit ab7b68cabd2a98b500edc2a0f8977a3f737f5cde)

383 files changed, 346 insertions, 346 deletions

diff --git a/tests/cpp_api/cpp-globalguard/Android.mk b/tests/cpp_api/cpp-globalguard/Android.mk
index b5929d89..0f98f77c 100644
--- a/tests/cpp_api/cpp-globalguard/Android.mk
+++ b/tests/cpp_api/cpp-globalguard/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
 LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_SRC_FILES:= \
-	multiply.rs \
+	multiply.rscript \
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/tests/cpp_api/cpp-globalguard/multiply.rs b/tests/cpp_api/cpp-globalguard/multiply.rscript
index 6ee7fb59..6ee7fb59 100644
--- a/tests/cpp_api/cpp-globalguard/multiply.rs
+++ b/tests/cpp_api/cpp-globalguard/multiply.rscript
diff --git a/tests/cpp_api/cppallocation/Android.mk b/tests/cpp_api/cppallocation/Android.mk
index d5786792..3b7a7d79 100644
--- a/tests/cpp_api/cppallocation/Android.mk
+++ b/tests/cpp_api/cppallocation/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
 LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_SRC_FILES:= \
-	multiply.rs \
+	multiply.rscript \
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/tests/cpp_api/cppallocation/multiply.rs b/tests/cpp_api/cppallocation/multiply.rscript
index 51ec7cbd..51ec7cbd 100644
--- a/tests/cpp_api/cppallocation/multiply.rs
+++ b/tests/cpp_api/cppallocation/multiply.rscript
diff --git a/tests/cpp_api/cppbasic-getpointer/Android.mk b/tests/cpp_api/cppbasic-getpointer/Android.mk
index 7ed20474..c50db0d8 100644
--- a/tests/cpp_api/cppbasic-getpointer/Android.mk
+++ b/tests/cpp_api/cppbasic-getpointer/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE:= rstest-compute-getpointer
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES:= \
-	mono.rs \
+	mono.rscript \
 	compute.cpp
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/tests/cpp_api/cppbasic-getpointer/mono.rs b/tests/cpp_api/cppbasic-getpointer/mono.rscript
index b1d7e6a6..b1d7e6a6 100644
--- a/tests/cpp_api/cppbasic-getpointer/mono.rs
+++ b/tests/cpp_api/cppbasic-getpointer/mono.rscript
diff --git a/tests/cpp_api/cppbasic-shared/Android.mk b/tests/cpp_api/cppbasic-shared/Android.mk
index 3d19bfd5..3ec3035c 100644
--- a/tests/cpp_api/cppbasic-shared/Android.mk
+++ b/tests/cpp_api/cppbasic-shared/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE:= rstest-compute-shared
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES:= \
-	mono.rs \
+	mono.rscript \
 	compute.cpp
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/tests/cpp_api/cppbasic-shared/mono.rs b/tests/cpp_api/cppbasic-shared/mono.rscript
index 11c0556d..11c0556d 100644
--- a/tests/cpp_api/cppbasic-shared/mono.rs
+++ b/tests/cpp_api/cppbasic-shared/mono.rscript
diff --git a/tests/cpp_api/cppbasic/Android.mk b/tests/cpp_api/cppbasic/Android.mk
index 0074e36d..979d364d 100644
--- a/tests/cpp_api/cppbasic/Android.mk
+++ b/tests/cpp_api/cppbasic/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
 LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_SRC_FILES:= \
-	mono.rs \
+	mono.rscript \
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/tests/cpp_api/cppbasic/mono.rs b/tests/cpp_api/cppbasic/mono.rscript
index 11c0556d..11c0556d 100644
--- a/tests/cpp_api/cppbasic/mono.rs
+++ b/tests/cpp_api/cppbasic/mono.rscript
diff --git a/tests/cpp_api/cppstrided/Android.mk b/tests/cpp_api/cppstrided/Android.mk
index f9805ef3..e88f6cf8 100644
--- a/tests/cpp_api/cppstrided/Android.mk
+++ b/tests/cpp_api/cppstrided/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
 LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_SRC_FILES:= \
-	multiply.rs \
+	multiply.rscript \
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/tests/cpp_api/cppstrided/multiply.rs b/tests/cpp_api/cppstrided/multiply.rscript
index 51ec7cbd..51ec7cbd 100644
--- a/tests/cpp_api/cppstrided/multiply.rs
+++ b/tests/cpp_api/cppstrided/multiply.rscript
diff --git a/tests/cpp_api/latency/Android.mk b/tests/cpp_api/latency/Android.mk
index 963363b5..59d49f53 100644
--- a/tests/cpp_api/latency/Android.mk
+++ b/tests/cpp_api/latency/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
 LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_SRC_FILES:= \
-	latency.rs \
+	latency.rscript \
 	latency.cpp
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/tests/cpp_api/latency/latency.rs b/tests/cpp_api/latency/latency.rscript
index 6fc4bfdc..6fc4bfdc 100644
--- a/tests/cpp_api/latency/latency.rs
+++ b/tests/cpp_api/latency/latency.rscript
diff --git a/tests/cpp_api/typecheck/Android.mk b/tests/cpp_api/typecheck/Android.mk
index 1895ed06..66ad6450 100644
--- a/tests/cpp_api/typecheck/Android.mk
+++ b/tests/cpp_api/typecheck/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
 LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_SRC_FILES:= \
-	kernels.rs \
+	kernels.rscript \
 	typecheck.cpp
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/tests/cpp_api/typecheck/kernels.rs b/tests/cpp_api/typecheck/kernels.rscript
index 9aa17521..9aa17521 100644
--- a/tests/cpp_api/typecheck/kernels.rs
+++ b/tests/cpp_api/typecheck/kernels.rscript
diff --git a/tests/java_api/Balls/src/com/example/android/rs/balls/ball_physics.rs b/tests/java_api/Balls/src/com/example/android/rs/balls/ball_physics.rscript
index a8c781d2..a8c781d2 100644
--- a/tests/java_api/Balls/src/com/example/android/rs/balls/ball_physics.rs
+++ b/tests/java_api/Balls/src/com/example/android/rs/balls/ball_physics.rscript
diff --git a/tests/java_api/Balls/src/com/example/android/rs/balls/balls.rs b/tests/java_api/Balls/src/com/example/android/rs/balls/balls.rscript
index 264aa3e0..264aa3e0 100644
--- a/tests/java_api/Balls/src/com/example/android/rs/balls/balls.rs
+++ b/tests/java_api/Balls/src/com/example/android/rs/balls/balls.rscript
diff --git a/tests/java_api/CannyLive/src/com/android/example/cannylive/canny.rs b/tests/java_api/CannyLive/src/com/android/example/cannylive/canny.rscript
index 82b14f11..82b14f11 100644
--- a/tests/java_api/CannyLive/src/com/android/example/cannylive/canny.rs
+++ b/tests/java_api/CannyLive/src/com/android/example/cannylive/canny.rscript
diff --git a/tests/java_api/ComputeBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rs b/tests/java_api/ComputeBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rscript
index fb8baaae..fb8baaae 100644
--- a/tests/java_api/ComputeBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rs
+++ b/tests/java_api/ComputeBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rscript
diff --git a/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/launchtest.rs b/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/launchtest.rscript
index cc70e4eb..cc70e4eb 100644
--- a/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/launchtest.rs
+++ b/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/launchtest.rscript
diff --git a/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/mandelbrot.rs b/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/mandelbrot.rscript
index 0ffb0e5a..0ffb0e5a 100644
--- a/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/mandelbrot.rs
+++ b/tests/java_api/ComputePerf/src/com/example/android/rs/computeperf/mandelbrot.rscript
diff --git a/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/find_region.rs b/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/find_region.rscript
index 249bd9a0..249bd9a0 100644
--- a/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/find_region.rs
+++ b/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/find_region.rscript
diff --git a/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/healing.rs b/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/healing.rscript
index 08e1f398..08e1f398 100644
--- a/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/healing.rs
+++ b/tests/java_api/HealingBrush/src/rs/example/android/com/healingbrush/healing.rscript
diff --git a/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk b/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk
index 9f72588c..b9fab0be 100644
--- a/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk
+++ b/tests/java_api/HelloComputeNDK/libhellocomputendk/Android.mk
@@ -21,7 +21,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_MODULE := libhellocomputendk
 LOCAL_MODULE_TAGS := tests
-LOCAL_SRC_FILES := helloComputeNDK.cpp mono.rs
+LOCAL_SRC_FILES := helloComputeNDK.cpp mono.rscript
 
 LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
 
diff --git a/tests/java_api/HelloComputeNDK/libhellocomputendk/mono.rs b/tests/java_api/HelloComputeNDK/libhellocomputendk/mono.rscript
index efa5c725..efa5c725 100644
--- a/tests/java_api/HelloComputeNDK/libhellocomputendk/mono.rs
+++ b/tests/java_api/HelloComputeNDK/libhellocomputendk/mono.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/artistic1.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/artistic1.rscript
index 2869e16b..2869e16b 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/artistic1.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/artistic1.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/blend.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/blend.rscript
index 63e7ea54..63e7ea54 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/blend.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/blend.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/bwfilter.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/bwfilter.rscript
index 23f64f59..23f64f59 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/bwfilter.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/bwfilter.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/colorcube.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/colorcube.rscript
index dbdd2f64..dbdd2f64 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/colorcube.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/colorcube.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/colormatrix.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/colormatrix.rscript
index d13ac647..d13ac647 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/colormatrix.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/colormatrix.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/contrast.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/contrast.rscript
index 71cb8c69..71cb8c69 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/contrast.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/contrast.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve3x3.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve3x3.rscript
index 3d811ced..3d811ced 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve3x3.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve3x3.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve5x5.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve5x5.rscript
index a9ddde20..a9ddde20 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve5x5.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/convolve5x5.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/copy.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/copy.rscript
index 04c86df0..04c86df0 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/copy.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/copy.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/exposure.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/exposure.rscript
index 5239e4e6..5239e4e6 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/exposure.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/exposure.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_full.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_full.rscript
index ed69ff46..ed69ff46 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_full.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_full.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_relaxed.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_relaxed.rscript
index 2a189251..2a189251 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_relaxed.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_approx_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_full.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_full.rscript
index f986b5df..f986b5df 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_full.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_full.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_relaxed.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_relaxed.rscript
index 31646c40..31646c40 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_relaxed.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/fisheye_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/grain.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/grain.rscript
index 6a883786..6a883786 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/grain.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/grain.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/greyscale.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/greyscale.rscript
index 3ac601d2..3ac601d2 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/greyscale.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/greyscale.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/histogram.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/histogram.rscript
index f34fcad7..f34fcad7 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/histogram.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/histogram.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_full.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_full.rscript
index 28596ba4..28596ba4 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_full.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_full.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_relaxed.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_relaxed.rscript
index c0bc4b7c..c0bc4b7c 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_relaxed.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/levels_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/mandelbrot.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/mandelbrot.rscript
index 99451f06..99451f06 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/mandelbrot.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/mandelbrot.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/mirror.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/mirror.rscript
index 6a075d02..6a075d02 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/mirror.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/mirror.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/resize.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/resize.rscript
index 84855111..84855111 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/resize.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/resize.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/shadows.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/shadows.rscript
index f852aae8..f852aae8 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/shadows.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/shadows.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/threshold.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/threshold.rscript
index 1309df59..1309df59 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/threshold.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/threshold.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/vibrance.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/vibrance.rscript
index acd9cf9a..acd9cf9a 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/vibrance.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/vibrance.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_full.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_full.rscript
index 00cbbc4d..00cbbc4d 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_full.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_full.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_relaxed.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_relaxed.rscript
index 347eb7ad..347eb7ad 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_relaxed.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_approx_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_full.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_full.rscript
index 8202c5c1..8202c5c1 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_full.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_full.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_relaxed.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_relaxed.rscript
index 262d516b..262d516b 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_relaxed.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/vignette_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing/src/com/android/rs/image/wbalance.rs b/tests/java_api/ImageProcessing/src/com/android/rs/image/wbalance.rscript
index c46c4912..c46c4912 100644
--- a/tests/java_api/ImageProcessing/src/com/android/rs/image/wbalance.rs
+++ b/tests/java_api/ImageProcessing/src/com/android/rs/image/wbalance.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/artistic1.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/artistic1.rscript
index 2869e16b..2869e16b 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/artistic1.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/artistic1.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/blend.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/blend.rscript
index 96dfc964..96dfc964 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/blend.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/blend.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/bwfilter.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/bwfilter.rscript
index e2116209..e2116209 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/bwfilter.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/bwfilter.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/colorcube.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/colorcube.rscript
index dbdd2f64..dbdd2f64 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/colorcube.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/colorcube.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/colormatrix.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/colormatrix.rscript
index d13ac647..d13ac647 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/colormatrix.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/colormatrix.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/contrast.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/contrast.rscript
index 71cb8c69..71cb8c69 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/contrast.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/contrast.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve3x3.rscript
index 3d811ced..3d811ced 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve3x3.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve5x5.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve5x5.rscript
index a9ddde20..a9ddde20 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve5x5.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/convolve5x5.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/copy.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/copy.rscript
index 04c86df0..04c86df0 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/copy.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/copy.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/exposure.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/exposure.rscript
index cd9e733a..cd9e733a 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/exposure.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/exposure.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_full.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_full.rscript
index ed69ff46..ed69ff46 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_full.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_full.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_relaxed.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_relaxed.rscript
index 2a189251..2a189251 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_relaxed.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_approx_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_full.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_full.rscript
index f986b5df..f986b5df 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_full.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_full.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_relaxed.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_relaxed.rscript
index 31646c40..31646c40 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_relaxed.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/fisheye_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/grain.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/grain.rscript
index 6a883786..6a883786 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/grain.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/grain.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/greyscale.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/greyscale.rscript
index 3ac601d2..3ac601d2 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/greyscale.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/greyscale.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_full.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_full.rscript
index 28596ba4..28596ba4 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_full.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_full.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_relaxed.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_relaxed.rscript
index c0bc4b7c..c0bc4b7c 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_relaxed.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/levels_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/mandelbrot.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/mandelbrot.rscript
index 99451f06..99451f06 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/mandelbrot.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/mandelbrot.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/posterize.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/posterize.rscript
index 043ea5e0..043ea5e0 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/posterize.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/posterize.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/resize.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/resize.rscript
index 84855111..84855111 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/resize.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/resize.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/shadows.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/shadows.rscript
index f852aae8..f852aae8 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/shadows.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/shadows.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/threshold.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/threshold.rscript
index 40d4fa2d..40d4fa2d 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/threshold.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/threshold.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/util.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/util.rscript
index f11b06c5..f11b06c5 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/util.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/util.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vibrance.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vibrance.rscript
index 7a492c08..7a492c08 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vibrance.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vibrance.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_full.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_full.rscript
index 00cbbc4d..00cbbc4d 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_full.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_full.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_relaxed.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_relaxed.rscript
index 347eb7ad..347eb7ad 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_relaxed.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_approx_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_full.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_full.rscript
index 8202c5c1..8202c5c1 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_full.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_full.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_relaxed.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_relaxed.rscript
index 262d516b..262d516b 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_relaxed.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/vignette_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing2/src/com/android/rs/image/wbalance.rs b/tests/java_api/ImageProcessing2/src/com/android/rs/image/wbalance.rscript
index c46c4912..c46c4912 100644
--- a/tests/java_api/ImageProcessing2/src/com/android/rs/image/wbalance.rs
+++ b/tests/java_api/ImageProcessing2/src/com/android/rs/image/wbalance.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/artistic1.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/artistic1.rscript
index 2869e16b..2869e16b 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/artistic1.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/artistic1.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/blend.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/blend.rscript
index 96dfc964..96dfc964 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/blend.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/blend.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/bwfilter.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/bwfilter.rscript
index 23f64f59..23f64f59 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/bwfilter.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/bwfilter.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colorcube.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colorcube.rscript
index dbdd2f64..dbdd2f64 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colorcube.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colorcube.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rscript
index d13ac647..d13ac647 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/contrast.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/contrast.rscript
index 71cb8c69..71cb8c69 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/contrast.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/contrast.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rscript
index 3d811ced..3d811ced 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rscript
index a9ddde20..a9ddde20 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/copy.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/copy.rscript
index 04c86df0..04c86df0 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/copy.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/copy.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/exposure.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/exposure.rscript
index 5239e4e6..5239e4e6 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/exposure.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/exposure.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_full.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_full.rscript
index ed69ff46..ed69ff46 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_full.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_full.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_relaxed.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_relaxed.rscript
index 2a189251..2a189251 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_relaxed.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_approx_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_full.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_full.rscript
index f986b5df..f986b5df 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_full.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_full.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_relaxed.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_relaxed.rscript
index 31646c40..31646c40 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_relaxed.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/fisheye_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/grain.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/grain.rscript
index 6a883786..6a883786 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/grain.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/grain.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/greyscale.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/greyscale.rscript
index 3ac601d2..3ac601d2 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/greyscale.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/greyscale.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/histogram.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/histogram.rscript
index 68bd6dcb..68bd6dcb 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/histogram.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/histogram.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_full.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_full.rscript
index 28596ba4..28596ba4 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_full.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_full.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_relaxed.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_relaxed.rscript
index c0bc4b7c..c0bc4b7c 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_relaxed.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/levels_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rscript
index 99451f06..99451f06 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/posterize.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/posterize.rscript
index 043ea5e0..043ea5e0 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/posterize.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/posterize.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/resize.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/resize.rscript
index 8381bc31..8381bc31 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/resize.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/resize.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/shadows.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/shadows.rscript
index f852aae8..f852aae8 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/shadows.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/shadows.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold.rscript
index 1309df59..1309df59 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold_half.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold_half.rscript
index 9b639952..9b639952 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold_half.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/threshold_half.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vibrance.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vibrance.rscript
index acd9cf9a..acd9cf9a 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vibrance.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vibrance.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_full.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_full.rscript
index 00cbbc4d..00cbbc4d 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_full.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_full.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_relaxed.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_relaxed.rscript
index 347eb7ad..347eb7ad 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_relaxed.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_approx_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_full.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_full.rscript
index 8202c5c1..8202c5c1 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_full.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_full.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_relaxed.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_relaxed.rscript
index 262d516b..262d516b 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_relaxed.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/vignette_relaxed.rscript
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/wbalance.rs b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/wbalance.rscript
index a3741a23..a3741a23 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/wbalance.rs
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/wbalance.rscript
diff --git a/tests/java_api/LatencyBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rs b/tests/java_api/LatencyBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rscript
index c6d1ea9b..c6d1ea9b 100644
--- a/tests/java_api/LatencyBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rs
+++ b/tests/java_api/LatencyBenchmark/src/com/example/android/rs/computebench/compute_benchmark.rscript
diff --git a/tests/java_api/LivePreview/src/com/android/rs/livepreview/yuv.rs b/tests/java_api/LivePreview/src/com/android/rs/livepreview/yuv.rscript
index c4f698f0..c4f698f0 100644
--- a/tests/java_api/LivePreview/src/com/android/rs/livepreview/yuv.rs
+++ b/tests/java_api/LivePreview/src/com/android/rs/livepreview/yuv.rscript
diff --git a/tests/java_api/MathErr/src/com/example/android/rs/matherr/math_err.rs b/tests/java_api/MathErr/src/com/example/android/rs/matherr/math_err.rscript
index a26770b9..a26770b9 100644
--- a/tests/java_api/MathErr/src/com/example/android/rs/matherr/math_err.rs
+++ b/tests/java_api/MathErr/src/com/example/android/rs/matherr/math_err.rscript
diff --git a/tests/java_api/RSTestBackward19/Android.mk b/tests/java_api/RSTestBackward19/Android.mk
index a226b45c..15da2d56 100644
--- a/tests/java_api/RSTestBackward19/Android.mk
+++ b/tests/java_api/RSTestBackward19/Android.mk
@@ -32,75 +32,75 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_reflection3264.java\
-    $(my_rs_unit_tests_path)/reflection3264.rs\
+    $(my_rs_unit_tests_path)/reflection3264.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTestForward/21.1.2/Android.mk b/tests/java_api/RSTestForward/21.1.2/Android.mk
index 99bce0c3..f67fbbd3 100644
--- a/tests/java_api/RSTestForward/21.1.2/Android.mk
+++ b/tests/java_api/RSTestForward/21.1.2/Android.mk
@@ -41,79 +41,79 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_multi.java\
-    $(my_rs_unit_tests_path)/foreach_multi.rs\
+    $(my_rs_unit_tests_path)/foreach_multi.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_math_agree.java\
-    $(my_rs_unit_tests_path)/math_agree.rs\
+    $(my_rs_unit_tests_path)/math_agree.rscript\
     $(my_rs_unit_tests_path)/UT_math_conformance.java\
-    $(my_rs_unit_tests_path)/math_conformance.rs\
+    $(my_rs_unit_tests_path)/math_conformance.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTestForward/22.0.1/Android.mk b/tests/java_api/RSTestForward/22.0.1/Android.mk
index cd49c744..34ccb5f2 100644
--- a/tests/java_api/RSTestForward/22.0.1/Android.mk
+++ b/tests/java_api/RSTestForward/22.0.1/Android.mk
@@ -41,79 +41,79 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_multi.java\
-    $(my_rs_unit_tests_path)/foreach_multi.rs\
+    $(my_rs_unit_tests_path)/foreach_multi.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_math_agree.java\
-    $(my_rs_unit_tests_path)/math_agree.rs\
+    $(my_rs_unit_tests_path)/math_agree.rscript\
     $(my_rs_unit_tests_path)/UT_math_conformance.java\
-    $(my_rs_unit_tests_path)/math_conformance.rs\
+    $(my_rs_unit_tests_path)/math_conformance.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTestForward/23.0.3/Android.mk b/tests/java_api/RSTestForward/23.0.3/Android.mk
index 6180f335..861541b0 100644
--- a/tests/java_api/RSTestForward/23.0.3/Android.mk
+++ b/tests/java_api/RSTestForward/23.0.3/Android.mk
@@ -41,100 +41,100 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_alloc_copy.java\
     $(my_rs_unit_tests_path)/UT_alloc_copyPadded.java\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_ctxt_default.java\
-    $(my_rs_unit_tests_path)/ctxt_default.rs\
+    $(my_rs_unit_tests_path)/ctxt_default.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_multi.java\
-    $(my_rs_unit_tests_path)/foreach_multi.rs\
+    $(my_rs_unit_tests_path)/foreach_multi.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel2d.java\
-    $(my_rs_unit_tests_path)/kernel2d.rs\
+    $(my_rs_unit_tests_path)/kernel2d.rscript\
     $(my_rs_unit_tests_path)/UT_kernel2d_oldstyle.java\
-    $(my_rs_unit_tests_path)/kernel2d_oldstyle.rs\
+    $(my_rs_unit_tests_path)/kernel2d_oldstyle.rscript\
     $(my_rs_unit_tests_path)/UT_kernel3d.java\
-    $(my_rs_unit_tests_path)/kernel3d.rs\
+    $(my_rs_unit_tests_path)/kernel3d.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_math_agree.java\
-    $(my_rs_unit_tests_path)/math_agree.rs\
+    $(my_rs_unit_tests_path)/math_agree.rscript\
     $(my_rs_unit_tests_path)/UT_math_conformance.java\
-    $(my_rs_unit_tests_path)/math_conformance.rs\
+    $(my_rs_unit_tests_path)/math_conformance.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug_23.java\
-    $(my_rs_unit_tests_path)/rsdebug_23.rs\
+    $(my_rs_unit_tests_path)/rsdebug_23.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_gatherscatter.java\
-    $(my_rs_unit_tests_path)/addup.rs\
+    $(my_rs_unit_tests_path)/addup.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_nochain.java\
-    $(my_rs_unit_tests_path)/increment.rs\
-    $(my_rs_unit_tests_path)/increment2.rs\
-    $(my_rs_unit_tests_path)/double.rs\
+    $(my_rs_unit_tests_path)/increment.rscript\
+    $(my_rs_unit_tests_path)/increment2.rscript\
+    $(my_rs_unit_tests_path)/double.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_pointwise.java\
-    $(my_rs_unit_tests_path)/increment.rs\
-    $(my_rs_unit_tests_path)/double.rs\
+    $(my_rs_unit_tests_path)/increment.rscript\
+    $(my_rs_unit_tests_path)/double.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTestForward/24.0.3/Android.mk b/tests/java_api/RSTestForward/24.0.3/Android.mk
index c6ebe09e..3e81caa7 100644
--- a/tests/java_api/RSTestForward/24.0.3/Android.mk
+++ b/tests/java_api/RSTestForward/24.0.3/Android.mk
@@ -41,124 +41,124 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_alloc_copy.java\
     $(my_rs_unit_tests_path)/UT_alloc_copyPadded.java\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_ctxt_default.java\
-    $(my_rs_unit_tests_path)/ctxt_default.rs\
+    $(my_rs_unit_tests_path)/ctxt_default.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_multi.java\
-    $(my_rs_unit_tests_path)/foreach_multi.rs\
+    $(my_rs_unit_tests_path)/foreach_multi.rscript\
     $(my_rs_unit_tests_path)/UT_fp16.java\
-    $(my_rs_unit_tests_path)/fp16.rs\
+    $(my_rs_unit_tests_path)/fp16.rscript\
     $(my_rs_unit_tests_path)/UT_fp16_globals.java\
-    $(my_rs_unit_tests_path)/fp16_globals.rs\
+    $(my_rs_unit_tests_path)/fp16_globals.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel2d.java\
-    $(my_rs_unit_tests_path)/kernel2d.rs\
+    $(my_rs_unit_tests_path)/kernel2d.rscript\
     $(my_rs_unit_tests_path)/UT_kernel2d_oldstyle.java\
-    $(my_rs_unit_tests_path)/kernel2d_oldstyle.rs\
+    $(my_rs_unit_tests_path)/kernel2d_oldstyle.rscript\
     $(my_rs_unit_tests_path)/UT_kernel3d.java\
-    $(my_rs_unit_tests_path)/kernel3d.rs\
+    $(my_rs_unit_tests_path)/kernel3d.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_math_24.java\
-    $(my_rs_unit_tests_path)/math_24.rs\
+    $(my_rs_unit_tests_path)/math_24.rscript\
     $(my_rs_unit_tests_path)/UT_math_agree.java\
-    $(my_rs_unit_tests_path)/math_agree.rs\
+    $(my_rs_unit_tests_path)/math_agree.rscript\
     $(my_rs_unit_tests_path)/UT_math_conformance.java\
-    $(my_rs_unit_tests_path)/math_conformance.rs\
+    $(my_rs_unit_tests_path)/math_conformance.rscript\
     $(my_rs_unit_tests_path)/UT_math_fp16.java\
-    $(my_rs_unit_tests_path)/math_fp16.rs\
+    $(my_rs_unit_tests_path)/math_fp16.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_reduce.java\
-    $(my_rs_unit_tests_path)/reduce.rs\
+    $(my_rs_unit_tests_path)/reduce.rscript\
     $(my_rs_unit_tests_path)/UT_reduce_backward.java\
-    $(my_rs_unit_tests_path)/reduce_backward.rs\
+    $(my_rs_unit_tests_path)/reduce_backward.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug_23.java\
-    $(my_rs_unit_tests_path)/rsdebug_23.rs\
+    $(my_rs_unit_tests_path)/rsdebug_23.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug_24.java\
-    $(my_rs_unit_tests_path)/rsdebug_24.rs\
+    $(my_rs_unit_tests_path)/rsdebug_24.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_float.java\
-    $(my_rs_unit_tests_path)/float_test.rs\
+    $(my_rs_unit_tests_path)/float_test.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_gatherscatter.java\
-    $(my_rs_unit_tests_path)/addup.rs\
+    $(my_rs_unit_tests_path)/addup.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_nochain.java\
-    $(my_rs_unit_tests_path)/increment.rs\
-    $(my_rs_unit_tests_path)/increment2.rs\
-    $(my_rs_unit_tests_path)/double.rs\
+    $(my_rs_unit_tests_path)/increment.rscript\
+    $(my_rs_unit_tests_path)/increment2.rscript\
+    $(my_rs_unit_tests_path)/double.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_pointwise.java\
-    $(my_rs_unit_tests_path)/increment.rs\
-    $(my_rs_unit_tests_path)/double.rs\
+    $(my_rs_unit_tests_path)/increment.rscript\
+    $(my_rs_unit_tests_path)/double.rscript\
     $(my_rs_unit_tests_path)/UT_single_source_alloc.java\
-    $(my_rs_unit_tests_path)/single_source_alloc.rs\
+    $(my_rs_unit_tests_path)/single_source_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_single_source_ref_count.java\
-    $(my_rs_unit_tests_path)/single_source_ref_count.rs\
+    $(my_rs_unit_tests_path)/single_source_ref_count.rscript\
     $(my_rs_unit_tests_path)/UT_single_source_script.java\
-    $(my_rs_unit_tests_path)/single_source_script.rs\
+    $(my_rs_unit_tests_path)/single_source_script.rscript\
     $(my_rs_unit_tests_path)/UT_small_struct_2.java\
-    $(my_rs_unit_tests_path)/small_struct_2.rs\
+    $(my_rs_unit_tests_path)/small_struct_2.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTestForward/25.0.2/Android.mk b/tests/java_api/RSTestForward/25.0.2/Android.mk
index a80624e4..127f29d8 100644
--- a/tests/java_api/RSTestForward/25.0.2/Android.mk
+++ b/tests/java_api/RSTestForward/25.0.2/Android.mk
@@ -41,124 +41,124 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_alloc_copy.java\
     $(my_rs_unit_tests_path)/UT_alloc_copyPadded.java\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_ctxt_default.java\
-    $(my_rs_unit_tests_path)/ctxt_default.rs\
+    $(my_rs_unit_tests_path)/ctxt_default.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_multi.java\
-    $(my_rs_unit_tests_path)/foreach_multi.rs\
+    $(my_rs_unit_tests_path)/foreach_multi.rscript\
     $(my_rs_unit_tests_path)/UT_fp16.java\
-    $(my_rs_unit_tests_path)/fp16.rs\
+    $(my_rs_unit_tests_path)/fp16.rscript\
     $(my_rs_unit_tests_path)/UT_fp16_globals.java\
-    $(my_rs_unit_tests_path)/fp16_globals.rs\
+    $(my_rs_unit_tests_path)/fp16_globals.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel2d.java\
-    $(my_rs_unit_tests_path)/kernel2d.rs\
+    $(my_rs_unit_tests_path)/kernel2d.rscript\
     $(my_rs_unit_tests_path)/UT_kernel2d_oldstyle.java\
-    $(my_rs_unit_tests_path)/kernel2d_oldstyle.rs\
+    $(my_rs_unit_tests_path)/kernel2d_oldstyle.rscript\
     $(my_rs_unit_tests_path)/UT_kernel3d.java\
-    $(my_rs_unit_tests_path)/kernel3d.rs\
+    $(my_rs_unit_tests_path)/kernel3d.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_math_24.java\
-    $(my_rs_unit_tests_path)/math_24.rs\
+    $(my_rs_unit_tests_path)/math_24.rscript\
     $(my_rs_unit_tests_path)/UT_math_agree.java\
-    $(my_rs_unit_tests_path)/math_agree.rs\
+    $(my_rs_unit_tests_path)/math_agree.rscript\
     $(my_rs_unit_tests_path)/UT_math_conformance.java\
-    $(my_rs_unit_tests_path)/math_conformance.rs\
+    $(my_rs_unit_tests_path)/math_conformance.rscript\
     $(my_rs_unit_tests_path)/UT_math_fp16.java\
-    $(my_rs_unit_tests_path)/math_fp16.rs\
+    $(my_rs_unit_tests_path)/math_fp16.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_reduce.java\
-    $(my_rs_unit_tests_path)/reduce.rs\
+    $(my_rs_unit_tests_path)/reduce.rscript\
     $(my_rs_unit_tests_path)/UT_reduce_backward.java\
-    $(my_rs_unit_tests_path)/reduce_backward.rs\
+    $(my_rs_unit_tests_path)/reduce_backward.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug_23.java\
-    $(my_rs_unit_tests_path)/rsdebug_23.rs\
+    $(my_rs_unit_tests_path)/rsdebug_23.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug_24.java\
-    $(my_rs_unit_tests_path)/rsdebug_24.rs\
+    $(my_rs_unit_tests_path)/rsdebug_24.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_float.java\
-    $(my_rs_unit_tests_path)/float_test.rs\
+    $(my_rs_unit_tests_path)/float_test.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_gatherscatter.java\
-    $(my_rs_unit_tests_path)/addup.rs\
+    $(my_rs_unit_tests_path)/addup.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_nochain.java\
-    $(my_rs_unit_tests_path)/increment.rs\
-    $(my_rs_unit_tests_path)/increment2.rs\
-    $(my_rs_unit_tests_path)/double.rs\
+    $(my_rs_unit_tests_path)/increment.rscript\
+    $(my_rs_unit_tests_path)/increment2.rscript\
+    $(my_rs_unit_tests_path)/double.rscript\
     $(my_rs_unit_tests_path)/UT_script_group2_pointwise.java\
-    $(my_rs_unit_tests_path)/increment.rs\
-    $(my_rs_unit_tests_path)/double.rs\
+    $(my_rs_unit_tests_path)/increment.rscript\
+    $(my_rs_unit_tests_path)/double.rscript\
     $(my_rs_unit_tests_path)/UT_single_source_alloc.java\
-    $(my_rs_unit_tests_path)/single_source_alloc.rs\
+    $(my_rs_unit_tests_path)/single_source_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_single_source_ref_count.java\
-    $(my_rs_unit_tests_path)/single_source_ref_count.rs\
+    $(my_rs_unit_tests_path)/single_source_ref_count.rscript\
     $(my_rs_unit_tests_path)/UT_single_source_script.java\
-    $(my_rs_unit_tests_path)/single_source_script.rs\
+    $(my_rs_unit_tests_path)/single_source_script.rscript\
     $(my_rs_unit_tests_path)/UT_small_struct_2.java\
-    $(my_rs_unit_tests_path)/small_struct_2.rs\
+    $(my_rs_unit_tests_path)/small_struct_2.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTest_CompatLib19/Android.mk b/tests/java_api/RSTest_CompatLib19/Android.mk
index 84e71f1b..80596d00 100644
--- a/tests/java_api/RSTest_CompatLib19/Android.mk
+++ b/tests/java_api/RSTest_CompatLib19/Android.mk
@@ -38,75 +38,75 @@ LOCAL_SRC_FILES :=\
     $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/UnitTest.java\
     $(my_rs_unit_tests_path)/UT_alloc.java\
-    $(my_rs_unit_tests_path)/alloc.rs\
+    $(my_rs_unit_tests_path)/alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_alloc.java\
-    $(my_rs_unit_tests_path)/array_alloc.rs\
+    $(my_rs_unit_tests_path)/array_alloc.rscript\
     $(my_rs_unit_tests_path)/UT_array_init.java\
-    $(my_rs_unit_tests_path)/array_init.rs\
+    $(my_rs_unit_tests_path)/array_init.rscript\
     $(my_rs_unit_tests_path)/UT_atomic.java\
-    $(my_rs_unit_tests_path)/atomic.rs\
+    $(my_rs_unit_tests_path)/atomic.rscript\
     $(my_rs_unit_tests_path)/UT_bitfield.java\
-    $(my_rs_unit_tests_path)/bitfield.rs\
+    $(my_rs_unit_tests_path)/bitfield.rscript\
     $(my_rs_unit_tests_path)/UT_bug_char.java\
-    $(my_rs_unit_tests_path)/bug_char.rs\
+    $(my_rs_unit_tests_path)/bug_char.rscript\
     $(my_rs_unit_tests_path)/UT_check_dims.java\
-    $(my_rs_unit_tests_path)/check_dims.rs\
+    $(my_rs_unit_tests_path)/check_dims.rscript\
     $(my_rs_unit_tests_path)/UT_clamp.java\
-    $(my_rs_unit_tests_path)/clamp.rs\
+    $(my_rs_unit_tests_path)/clamp.rscript\
     $(my_rs_unit_tests_path)/UT_clamp_relaxed.java\
-    $(my_rs_unit_tests_path)/clamp_relaxed.rs\
+    $(my_rs_unit_tests_path)/clamp_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_constant.java\
-    $(my_rs_unit_tests_path)/constant.rs\
+    $(my_rs_unit_tests_path)/constant.rscript\
     $(my_rs_unit_tests_path)/UT_convert.java\
-    $(my_rs_unit_tests_path)/convert.rs\
+    $(my_rs_unit_tests_path)/convert.rscript\
     $(my_rs_unit_tests_path)/UT_convert_relaxed.java\
-    $(my_rs_unit_tests_path)/convert_relaxed.rs\
+    $(my_rs_unit_tests_path)/convert_relaxed.rscript\
     $(my_rs_unit_tests_path)/UT_copy_test.java\
-    $(my_rs_unit_tests_path)/copy_test.rs\
+    $(my_rs_unit_tests_path)/copy_test.rscript\
     $(my_rs_unit_tests_path)/UT_element.java\
-    $(my_rs_unit_tests_path)/element.rs\
+    $(my_rs_unit_tests_path)/element.rscript\
     $(my_rs_unit_tests_path)/UT_foreach.java\
-    $(my_rs_unit_tests_path)/foreach.rs\
+    $(my_rs_unit_tests_path)/foreach.rscript\
     $(my_rs_unit_tests_path)/UT_foreach_bounds.java\
-    $(my_rs_unit_tests_path)/foreach_bounds.rs\
+    $(my_rs_unit_tests_path)/foreach_bounds.rscript\
     $(my_rs_unit_tests_path)/UT_fp_mad.java\
-    $(my_rs_unit_tests_path)/fp_mad.rs\
+    $(my_rs_unit_tests_path)/fp_mad.rscript\
     $(my_rs_unit_tests_path)/UT_instance.java\
-    $(my_rs_unit_tests_path)/instance.rs\
+    $(my_rs_unit_tests_path)/instance.rscript\
     $(my_rs_unit_tests_path)/UT_int4.java\
-    $(my_rs_unit_tests_path)/int4.rs\
+    $(my_rs_unit_tests_path)/int4.rscript\
     $(my_rs_unit_tests_path)/UT_kernel.java\
-    $(my_rs_unit_tests_path)/kernel.rs\
+    $(my_rs_unit_tests_path)/kernel.rscript\
     $(my_rs_unit_tests_path)/UT_kernel_struct.java\
-    $(my_rs_unit_tests_path)/kernel_struct.rs\
+    $(my_rs_unit_tests_path)/kernel_struct.rscript\
     $(my_rs_unit_tests_path)/UT_math.java\
-    $(my_rs_unit_tests_path)/math.rs\
+    $(my_rs_unit_tests_path)/math.rscript\
     $(my_rs_unit_tests_path)/UT_min.java\
-    $(my_rs_unit_tests_path)/min.rs\
+    $(my_rs_unit_tests_path)/min.rscript\
     $(my_rs_unit_tests_path)/UT_noroot.java\
-    $(my_rs_unit_tests_path)/noroot.rs\
+    $(my_rs_unit_tests_path)/noroot.rscript\
     $(my_rs_unit_tests_path)/UT_primitives.java\
-    $(my_rs_unit_tests_path)/primitives.rs\
+    $(my_rs_unit_tests_path)/primitives.rscript\
     $(my_rs_unit_tests_path)/UT_refcount.java\
-    $(my_rs_unit_tests_path)/refcount.rs\
+    $(my_rs_unit_tests_path)/refcount.rscript\
     $(my_rs_unit_tests_path)/UT_reflection3264.java\
-    $(my_rs_unit_tests_path)/reflection3264.rs\
+    $(my_rs_unit_tests_path)/reflection3264.rscript\
     $(my_rs_unit_tests_path)/UT_rsdebug.java\
-    $(my_rs_unit_tests_path)/rsdebug.rs\
+    $(my_rs_unit_tests_path)/rsdebug.rscript\
     $(my_rs_unit_tests_path)/UT_rstime.java\
-    $(my_rs_unit_tests_path)/rstime.rs\
+    $(my_rs_unit_tests_path)/rstime.rscript\
     $(my_rs_unit_tests_path)/UT_rstypes.java\
-    $(my_rs_unit_tests_path)/rstypes.rs\
+    $(my_rs_unit_tests_path)/rstypes.rscript\
     $(my_rs_unit_tests_path)/UT_sampler.java\
-    $(my_rs_unit_tests_path)/sampler.rs\
+    $(my_rs_unit_tests_path)/sampler.rscript\
     $(my_rs_unit_tests_path)/UT_static_globals.java\
-    $(my_rs_unit_tests_path)/static_globals.rs\
+    $(my_rs_unit_tests_path)/static_globals.rscript\
     $(my_rs_unit_tests_path)/UT_struct.java\
-    $(my_rs_unit_tests_path)/struct.rs\
+    $(my_rs_unit_tests_path)/struct.rscript\
     $(my_rs_unit_tests_path)/UT_unsigned.java\
-    $(my_rs_unit_tests_path)/unsigned.rs\
+    $(my_rs_unit_tests_path)/unsigned.rscript\
     $(my_rs_unit_tests_path)/UT_vector.java\
-    $(my_rs_unit_tests_path)/vector.rs\
+    $(my_rs_unit_tests_path)/vector.rscript\
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/alloc.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/alloc.rscript
index 1b5e2ac5..1b5e2ac5 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/alloc.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/alloc.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/apitest.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/apitest.rscript
index 865620f2..865620f2 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/apitest.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/apitest.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_alloc.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_alloc.rscript
index 74ffdb16..74ffdb16 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_alloc.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_alloc.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_init.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_init.rscript
index 842249af..842249af 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_init.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/array_init.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/atomic.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/atomic.rscript
index f0a50419..f0a50419 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/atomic.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/atomic.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/bug_char.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/bug_char.rscript
index dcd7b727..dcd7b727 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/bug_char.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/bug_char.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp.rscript
index 28b00bdc..28b00bdc 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp_relaxed.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp_relaxed.rs
deleted file mode 100644
index 71c65aee..00000000
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp_relaxed.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "clamp.rs"
-#pragma rs_fp_relaxed
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp_relaxed.rscript b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp_relaxed.rscript
new file mode 100644
index 00000000..a9514c35
--- /dev/null
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/clamp_relaxed.rscript
@@ -0,0 +1,2 @@
+#include "clamp.rscript"
+#pragma rs_fp_relaxed
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/constant.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/constant.rscript
index 732eaefa..732eaefa 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/constant.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/constant.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert.rscript
index e314f2bc..e314f2bc 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert_relaxed.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert_relaxed.rs
deleted file mode 100644
index 81abb9b1..00000000
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert_relaxed.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "convert.rs"
-#pragma rs_fp_relaxed
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert_relaxed.rscript b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert_relaxed.rscript
new file mode 100644
index 00000000..ad41780e
--- /dev/null
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/convert_relaxed.rscript
@@ -0,0 +1,2 @@
+#include "convert.rscript"
+#pragma rs_fp_relaxed
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/copy_test.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/copy_test.rscript
index f4243eba..f4243eba 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/copy_test.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/copy_test.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/element.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/element.rscript
index c7a7a87f..c7a7a87f 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/element.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/element.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach.rscript
index 08e6bede..08e6bede 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach_bounds.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach_bounds.rscript
index 875f2156..875f2156 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach_bounds.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/foreach_bounds.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/fp_mad.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/fp_mad.rscript
index 3e8889ed..3e8889ed 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/fp_mad.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/fp_mad.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/instance.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/instance.rscript
index 65ce0326..65ce0326 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/instance.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/instance.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/int4.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/int4.rscript
index c791cabc..c791cabc 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/int4.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/int4.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel.rscript
index 6972737e..6972737e 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel_struct.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel_struct.rscript
index 83484a2b..83484a2b 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel_struct.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/kernel_struct.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math.rscript
index aae29a4c..aae29a4c 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_agree.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_agree.rscript
index 80f73bef..80f73bef 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_agree.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_agree.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_conformance.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_conformance.rscript
index ae78feba..ae78feba 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_conformance.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/math_conformance.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/min.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/min.rscript
index 4b92763f..4b92763f 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/min.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/min.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/noroot.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/noroot.rscript
index 2c807bdf..2c807bdf 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/noroot.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/noroot.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/primitives.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/primitives.rscript
index ce451da8..ce451da8 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/primitives.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/primitives.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/refcount.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/refcount.rscript
index 4ea70e2e..4ea70e2e 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/refcount.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/refcount.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rsdebug.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rsdebug.rscript
index 68ac1689..68ac1689 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rsdebug.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rsdebug.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rslist.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rslist.rscript
index 62aa6960..62aa6960 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rslist.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rslist.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstime.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstime.rscript
index 7be955d5..7be955d5 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstime.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstime.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstypes.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstypes.rscript
index afada817..afada817 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstypes.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/rstypes.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/sampler.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/sampler.rscript
index ff1c0a74..ff1c0a74 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/sampler.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/sampler.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/struct.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/struct.rscript
index 1cd728e9..1cd728e9 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/struct.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/struct.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/unsigned.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/unsigned.rscript
index 2c056f49..2c056f49 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/unsigned.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/unsigned.rscript
diff --git a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/vector.rs b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/vector.rscript
index 0430a2fc..0430a2fc 100644
--- a/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/vector.rs
+++ b/tests/java_api/RSTest_CompatLibLegacy/src/com/android/rs/test/vector.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java
index 567afbe6..69e9e021 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java
@@ -48,7 +48,7 @@ public class UT_script_group2_gatherscatter extends UnitTest {
     // on global allocations that are passed across kernels in a script group.
     // The test sums up all elements in the input int4 array of size ARRAY_SIZE.
     // To do so, it adds up the second half of the array to its first half using
-    // kernel function add() in addsup.rs, and then repeatedly applies the same
+    // kernel function add() in addsup.rscript, and then repeatedly applies the same
     // kernel function to the shrinking result arrays until the result is a
     // single int4 value.
     // These steps are created as a script group by repeatedly adding the
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rscript
index 4f48798a..4f48798a 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rscript
index bf271d59..bf271d59 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rscript
index 79ede39f..79ede39f 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rscript
index 03e27871..03e27871 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rscript
index b81669d1..b81669d1 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rscript
index fe221389..fe221389 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rscript
index 8e11d895..8e11d895 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rscript
index 57c14b24..57c14b24 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rscript
index 6de80c98..6de80c98 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rscript
index 93fd7cb4..b828ae0d 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rscript
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-#include "convert.rs"
+#include "clamp.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rscript
index aad61e98..aad61e98 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rscript
index a9eb16dd..a9eb16dd 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rscript
index 9cc597f7..915143ac 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rscript
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-#include "clamp.rs"
+#include "convert.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rscript
index 34fd01b0..34fd01b0 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rscript
index cae6fb72..cae6fb72 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rscript
index dc5f4d55..dc5f4d55 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rscript
index 9dceea4c..9dceea4c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rscript
index 46e8ef66..46e8ef66 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rscript
index ed53cd70..ed53cd70 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rscript
index 854df668..854df668 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rscript
index 86603e4f..86603e4f 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rscript
index 0e01b9aa..0e01b9aa 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rscript
index fd8906f6..fd8906f6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rscript
index 9ba1f923..9ba1f923 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rscript
index 3fc2c5a5..3fc2c5a5 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rscript
index a0de51c6..a0de51c6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rscript
index 3c3208c4..3c3208c4 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rscript
index fac0619b..fac0619b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rscript
index dd6a2e67..dd6a2e67 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rscript
index 69e95c85..69e95c85 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rscript
index 7d76c9ae..7d76c9ae 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rscript
index 1771a7c8..1771a7c8 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rscript
index f54fe6d7..f54fe6d7 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rscript
index 2e534810..2e534810 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rscript
index bc0ed54c..bc0ed54c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rscript
index 6d8fd5c2..6d8fd5c2 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rscript
index 402bbfed..402bbfed 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rscript
index 04cd8d0b..04cd8d0b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rscript
index 5833a295..5833a295 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rscript
index d850c86b..d850c86b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rscript
index 290a28d4..290a28d4 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rscript
index cff0b854..cff0b854 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rscript
index ab4ff330..ab4ff330 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rscript
index 805ba6ca..805ba6ca 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rscript
index 159b3184..159b3184 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rscript
index 046650e6..046650e6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rscript
index 7fbd4db6..7fbd4db6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rscript
index 08a1a42c..08a1a42c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rscript
index a47df28b..a47df28b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rscript
index d53538c2..d53538c2 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rscript
index 89aa2100..89aa2100 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rscript
index b4d19126..b4d19126 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rscript
index 20d6e9a1..20d6e9a1 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rscript
index 773bb634..773bb634 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rscript
index 7841573e..7841573e 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rscript
index da6b7ff3..da6b7ff3 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rscript
index 303bf999..303bf999 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rscript
index 06f1f2ed..06f1f2ed 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rscript
index 755a7174..755a7174 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rscript
index 5ec4591e..5ec4591e 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rscript
index 53e58e07..53e58e07 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rscript
index c81f270b..c81f270b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rs b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rscript
index 26497798..26497798 100644
--- a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rs
+++ b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rs b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rscript
index b0829a38..b0829a38 100644
--- a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rs
+++ b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java
index 9146872a..8d8605da 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java
@@ -50,7 +50,7 @@ public class UT_script_group2_gatherscatter extends UnitTest {
     // on global allocations that are passed across kernels in a script group.
     // The test sums up all elements in the input int4 array of size ARRAY_SIZE.
     // To do so, it adds up the second half of the array to its first half using
-    // kernel function add() in addsup.rs, and then repeatedly applies the same
+    // kernel function add() in addsup.rscript, and then repeatedly applies the same
     // kernel function to the shrinking result arrays until the result is a
     // single int4 value.
     // These steps are created as a script group by repeatedly adding the
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rscript
index 209a6232..209a6232 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rscript
index 5ebeef08..5ebeef08 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rscript
index e3f75527..e3f75527 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rscript
index 28f6c8f9..28f6c8f9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rscript
index 15c6c03a..15c6c03a 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rscript
index 9e266635..9e266635 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rscript
index 21fa5f2f..21fa5f2f 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rscript
index e6cea9f0..e6cea9f0 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rscript
index e9b450c9..e9b450c9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rscript
index 8af7fd07..8af7fd07 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rscript
index b0c072e3..b0c072e3 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rscript
index 05de3c3f..72ae631d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rscript
@@ -16,5 +16,5 @@
  * limitations under the License.
  */
 
-#include "convert.rs"
+#include "clamp.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rscript
index 8333327d..8333327d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rscript
index 136bbcf1..136bbcf1 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rscript
index f391d62b..48b61c4d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rscript
@@ -16,5 +16,5 @@
  * limitations under the License.
  */
 
-#include "clamp.rs"
+#include "convert.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rscript
index 419d5503..419d5503 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rscript
index 324d8f9d..324d8f9d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rscript
index fcef0982..fcef0982 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rscript
index 355c9279..355c9279 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rscript
index adceb864..adceb864 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rscript
index e3174451..e3174451 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rscript
index a1b65b17..a1b65b17 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rscript
index 33501e2e..33501e2e 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rscript
index d2ca9f37..d2ca9f37 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rscript
index 0cfc328b..0cfc328b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rscript
index b314a150..b314a150 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rscript
index 548fdc1b..548fdc1b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rscript
index 5c97ca66..5c97ca66 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rscript
index df860640..df860640 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rscript
index f6623919..f6623919 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rscript
index 7a93b2e5..7a93b2e5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rscript
index 2761f069..2761f069 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rscript
index d8ec9b5f..d8ec9b5f 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rscript
index 895ddc65..895ddc65 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rscript
index e5a45674..e5a45674 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rscript
index b02c38c5..b02c38c5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rscript
index 81fe1fe9..81fe1fe9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rscript
index 7dbb1d4e..7dbb1d4e 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rscript
index 07387804..07387804 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rscript
index 6dc77c24..6dc77c24 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rscript
index eaeeb639..eaeeb639 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rscript
index 5442851a..5442851a 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rscript
index 497a886a..497a886a 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rscript
index e6959e59..e6959e59 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rscript
index 7225b435..7225b435 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rscript
index a6e9453b..a6e9453b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rscript
index 9e6e72f3..9e6e72f3 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rscript
index 40040fa6..40040fa6 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rscript
index 1e62192d..1e62192d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rscript
index d2411cf5..d2411cf5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rscript
index 69b0e75f..69b0e75f 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rscript
index 09fa035c..09fa035c 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rscript
index 593fd91c..593fd91c 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rscript
index 3c57acd6..3c57acd6 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rscript
index 0e4966a5..0e4966a5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rscript
index b537efff..b537efff 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rscript
index 3f1730d9..3f1730d9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rscript
index 0d345fa6..0d345fa6 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rscript
index 7995b9d1..7995b9d1 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rscript
index 10702360..10702360 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rscript
index 5e54043b..5e54043b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rscript
diff --git a/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_d1new.rs b/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_d1new.rscript
index 750e4ee2..750e4ee2 100644
--- a/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_d1new.rs
+++ b/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_d1new.rscript
diff --git a/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_f32.rs b/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_f32.rscript
index 55864356..55864356 100644
--- a/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_f32.rs
+++ b/tests/java_api/Refocus/src/com/android/rs/test/layered_filter_fast_f32.rscript
diff --git a/tests/java_api/RsCameraDemo/src/com/android/example/rscamera/focus_peak.rs b/tests/java_api/RsCameraDemo/src/com/android/example/rscamera/focus_peak.rscript
index 6513bc1b..6513bc1b 100644
--- a/tests/java_api/RsCameraDemo/src/com/android/example/rscamera/focus_peak.rs
+++ b/tests/java_api/RsCameraDemo/src/com/android/example/rscamera/focus_peak.rscript
diff --git a/tests/java_api/RsNbody/src/com/example/android/rs/nbody_gl/nbody.rs b/tests/java_api/RsNbody/src/com/example/android/rs/nbody_gl/nbody.rscript
index e29e9540..e29e9540 100644
--- a/tests/java_api/RsNbody/src/com/example/android/rs/nbody_gl/nbody.rs
+++ b/tests/java_api/RsNbody/src/com/example/android/rs/nbody_gl/nbody.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/fp_mad.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/fp_mad.rscript
index 62ef3ecf..62ef3ecf 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/fp_mad.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/fp_mad.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/math.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/math.rscript
index 2867be1c..2867be1c 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/math.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/math.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/primitives.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/primitives.rscript
index ce451da8..ce451da8 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/primitives.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/primitives.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/rsdebug.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/rsdebug.rscript
index f7942a5e..f7942a5e 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/rsdebug.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/rsdebug.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/rslist.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/rslist.rscript
index 5b2501fc..5b2501fc 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/rslist.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/rslist.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/rstime.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/rstime.rscript
index 7be955d5..7be955d5 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/rstime.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/rstime.rscript
diff --git a/tests/java_api/RsTest_11/src/com/android/rs/test/rstypes.rs b/tests/java_api/RsTest_11/src/com/android/rs/test/rstypes.rscript
index afda39f8..afda39f8 100644
--- a/tests/java_api/RsTest_11/src/com/android/rs/test/rstypes.rs
+++ b/tests/java_api/RsTest_11/src/com/android/rs/test/rstypes.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/alloc.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/alloc.rscript
index 1b5e2ac5..1b5e2ac5 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/alloc.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/alloc.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/foreach.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/foreach.rscript
index 3fa8f85c..3fa8f85c 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/foreach.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/foreach.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/fp_mad.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/fp_mad.rscript
index 62ef3ecf..62ef3ecf 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/fp_mad.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/fp_mad.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/math.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/math.rscript
index e6b37f6a..e6b37f6a 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/math.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/math.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/primitives.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/primitives.rscript
index ce451da8..ce451da8 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/primitives.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/primitives.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/refcount.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/refcount.rscript
index 4ea70e2e..4ea70e2e 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/refcount.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/refcount.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/rsdebug.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/rsdebug.rscript
index f7942a5e..f7942a5e 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/rsdebug.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/rsdebug.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/rslist.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/rslist.rscript
index b3d8b9e3..b3d8b9e3 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/rslist.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/rslist.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/rstime.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/rstime.rscript
index 7be955d5..7be955d5 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/rstime.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/rstime.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/rstypes.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/rstypes.rscript
index 8577604d..8577604d 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/rstypes.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/rstypes.rscript
diff --git a/tests/java_api/RsTest_14/src/com/android/rs/test/vector.rs b/tests/java_api/RsTest_14/src/com/android/rs/test/vector.rscript
index 0430a2fc..0430a2fc 100644
--- a/tests/java_api/RsTest_14/src/com/android/rs/test/vector.rs
+++ b/tests/java_api/RsTest_14/src/com/android/rs/test/vector.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/alloc.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/alloc.rscript
index 1b5e2ac5..1b5e2ac5 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/alloc.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/alloc.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/foreach.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/foreach.rscript
index 3fa8f85c..3fa8f85c 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/foreach.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/foreach.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/fp_mad.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/fp_mad.rscript
index 62ef3ecf..62ef3ecf 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/fp_mad.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/fp_mad.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/math.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/math.rscript
index e6b37f6a..e6b37f6a 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/math.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/math.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/primitives.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/primitives.rscript
index ce451da8..ce451da8 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/primitives.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/primitives.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/refcount.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/refcount.rscript
index 4ea70e2e..4ea70e2e 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/refcount.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/refcount.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/rsdebug.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/rsdebug.rscript
index f7942a5e..f7942a5e 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/rsdebug.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/rsdebug.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/rslist.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/rslist.rscript
index 070eb7d1..070eb7d1 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/rslist.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/rslist.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/rstime.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/rstime.rscript
index 7be955d5..7be955d5 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/rstime.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/rstime.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/rstypes.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/rstypes.rscript
index a517189f..a517189f 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/rstypes.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/rstypes.rscript
diff --git a/tests/java_api/RsTest_16/src/com/android/rs/test/vector.rs b/tests/java_api/RsTest_16/src/com/android/rs/test/vector.rscript
index 0430a2fc..0430a2fc 100644
--- a/tests/java_api/RsTest_16/src/com/android/rs/test/vector.rs
+++ b/tests/java_api/RsTest_16/src/com/android/rs/test/vector.rscript
diff --git a/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/find_region.rs b/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/find_region.rscript
index 7ec95757..7ec95757 100644
--- a/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/find_region.rs
+++ b/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/find_region.rscript
diff --git a/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/healing.rs b/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/healing.rscript
index ff2ad211..ff2ad211 100644
--- a/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/healing.rs
+++ b/tests/java_api/SSHealingBrush/src/rs/example/android/com/healingbrush/healing.rscript
diff --git a/tests/java_api/SampleTest/src/com/android/rs/sample/sample.rs b/tests/java_api/SampleTest/src/com/android/rs/sample/sample.rscript
index a9227024..a9227024 100644
--- a/tests/java_api/SampleTest/src/com/android/rs/sample/sample.rs
+++ b/tests/java_api/SampleTest/src/com/android/rs/sample/sample.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/colormatrix_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/colormatrix_f.rscript
index 2efa9e39..2efa9e39 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/colormatrix_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/colormatrix_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/contrast_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/contrast_f.rscript
index ab85f1ed..ab85f1ed 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/contrast_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/contrast_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/exposure_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/exposure_f.rscript
index e242c5f1..e242c5f1 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/exposure_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/exposure_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/f4touc4.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/f4touc4.rscript
index 4538e06d..4538e06d 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/f4touc4.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/f4touc4.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_relaxed_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_relaxed_f.rscript
index 27a5eb25..27a5eb25 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_relaxed_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/fisheye_approx_relaxed_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/greyscale_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/greyscale_f.rscript
index c42e1865..c42e1865 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/greyscale_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/greyscale_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/levels_relaxed_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/levels_relaxed_f.rscript
index 14af0735..14af0735 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/levels_relaxed_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/levels_relaxed_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/shadows_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/shadows_f.rscript
index 4ae6cea1..4ae6cea1 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/shadows_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/shadows_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/uc4tof4.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/uc4tof4.rscript
index 5d08194c..5d08194c 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/uc4tof4.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/uc4tof4.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vibrance_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vibrance_f.rscript
index d13ef0d4..d13ef0d4 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vibrance_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vibrance_f.rscript
diff --git a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vignette_approx_relaxed_f.rs b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vignette_approx_relaxed_f.rscript
index b3e09568..b3e09568 100644
--- a/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vignette_approx_relaxed_f.rs
+++ b/tests/java_api/ScriptGroupTest/src/com/android/rs/sgtest/vignette_approx_relaxed_f.rscript
diff --git a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bricked.rs b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bricked.rscript
index cf5bd91c..cf5bd91c 100644
--- a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bricked.rs
+++ b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bricked.rscript
diff --git a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bugdroid.rs b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bugdroid.rscript
index 62edc6e1..62edc6e1 100644
--- a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bugdroid.rs
+++ b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/bugdroid.rscript
diff --git a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/mandelbulb.rs b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/mandelbulb.rscript
index 52bf75ca..52bf75ca 100644
--- a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/mandelbulb.rs
+++ b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/mandelbulb.rscript
diff --git a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/rasterize.rs b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/rasterize.rscript
index 092a382e..092a382e 100644
--- a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/rasterize.rs
+++ b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/rasterize.rscript
diff --git a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/vr.rs b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/vr.rscript
index e3004cc4..e3004cc4 100644
--- a/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/vr.rs
+++ b/tests/java_api/VrDemo/src/com/example/android/rs/vr/engine/vr.rscript
diff --git a/tests/lldb/cpp/Allocations/Android.mk b/tests/lldb/cpp/Allocations/Android.mk
index 16ed1b2e..11b484ff 100644
--- a/tests/lldb/cpp/Allocations/Android.mk
+++ b/tests/lldb/cpp/Allocations/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE := CppAllocations
 
 LOCAL_SRC_FILES := \
 	Allocations.cpp \
-	allocs.rs
+	allocs.rscript
 
 LOCAL_STATIC_LIBRARIES := libcompiler_rt
 
diff --git a/tests/lldb/cpp/Allocations/allocs.rs b/tests/lldb/cpp/Allocations/allocs.rscript
index eff79777..eff79777 100644
--- a/tests/lldb/cpp/Allocations/allocs.rs
+++ b/tests/lldb/cpp/Allocations/allocs.rscript
diff --git a/tests/lldb/cpp/BranchingFunCalls/Android.mk b/tests/lldb/cpp/BranchingFunCalls/Android.mk
index 56bd1524..12a3e322 100644
--- a/tests/lldb/cpp/BranchingFunCalls/Android.mk
+++ b/tests/lldb/cpp/BranchingFunCalls/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE := CppBranchingFunCalls
 
 LOCAL_SRC_FILES := \
 	BranchingFunCalls.cpp \
-	scalars.rs
+	scalars.rscript
 
 include frameworks/rs/tests/lldb/cpp/common.mk
 include $(BUILD_EXECUTABLE)
diff --git a/tests/lldb/cpp/BranchingFunCalls/scalars.rs b/tests/lldb/cpp/BranchingFunCalls/scalars.rscript
index 279694d7..279694d7 100644
--- a/tests/lldb/cpp/BranchingFunCalls/scalars.rs
+++ b/tests/lldb/cpp/BranchingFunCalls/scalars.rscript
diff --git a/tests/lldb/cpp/InfiniteLoop/Android.mk b/tests/lldb/cpp/InfiniteLoop/Android.mk
index bfcb13a6..f0895ecf 100644
--- a/tests/lldb/cpp/InfiniteLoop/Android.mk
+++ b/tests/lldb/cpp/InfiniteLoop/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE := CppInfiniteLoop
 
 LOCAL_SRC_FILES := \
 	InfiniteLoop.cpp \
-	infiniteloop.rs
+	infiniteloop.rscript
 
 include frameworks/rs/tests/lldb/cpp/common.mk
 include $(BUILD_EXECUTABLE)
diff --git a/tests/lldb/cpp/InfiniteLoop/infiniteloop.rs b/tests/lldb/cpp/InfiniteLoop/infiniteloop.rscript
index 7eff95c7..7eff95c7 100644
--- a/tests/lldb/cpp/InfiniteLoop/infiniteloop.rs
+++ b/tests/lldb/cpp/InfiniteLoop/infiniteloop.rscript
diff --git a/tests/lldb/cpp/KernelVariables/Android.mk b/tests/lldb/cpp/KernelVariables/Android.mk
index 2d404756..b9f9102e 100644
--- a/tests/lldb/cpp/KernelVariables/Android.mk
+++ b/tests/lldb/cpp/KernelVariables/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE := CppKernelVariables
 
 LOCAL_SRC_FILES := \
 	KernelVariables.cpp \
-	simple.rs
+	simple.rscript
 
 include frameworks/rs/tests/lldb/cpp/common.mk
 include $(BUILD_EXECUTABLE)
diff --git a/tests/lldb/cpp/KernelVariables/simple.rs b/tests/lldb/cpp/KernelVariables/simple.rscript
index bad675eb..bad675eb 100644
--- a/tests/lldb/cpp/KernelVariables/simple.rs
+++ b/tests/lldb/cpp/KernelVariables/simple.rscript
diff --git a/tests/lldb/cpp/MultipleRSFiles/Android.mk b/tests/lldb/cpp/MultipleRSFiles/Android.mk
index 334f0303..4c224b8a 100644
--- a/tests/lldb/cpp/MultipleRSFiles/Android.mk
+++ b/tests/lldb/cpp/MultipleRSFiles/Android.mk
@@ -5,8 +5,8 @@ LOCAL_MODULE := CppMultipleRSFiles
 
 LOCAL_SRC_FILES := \
 	MultipleRSFiles.cpp \
-	first.rs \
-	second.rs
+	first.rscript \
+	second.rscript
 
 include frameworks/rs/tests/lldb/cpp/common.mk
 include $(BUILD_EXECUTABLE)
diff --git a/tests/lldb/cpp/MultipleRSFiles/first.rs b/tests/lldb/cpp/MultipleRSFiles/first.rscript
index 2f84c465..2f84c465 100644
--- a/tests/lldb/cpp/MultipleRSFiles/first.rs
+++ b/tests/lldb/cpp/MultipleRSFiles/first.rscript
diff --git a/tests/lldb/cpp/MultipleRSFiles/second.rs b/tests/lldb/cpp/MultipleRSFiles/second.rscript
index 0279d0ff..0279d0ff 100644
--- a/tests/lldb/cpp/MultipleRSFiles/second.rs
+++ b/tests/lldb/cpp/MultipleRSFiles/second.rscript
diff --git a/tests/lldb/cpp/WaitAttach/Android.mk b/tests/lldb/cpp/WaitAttach/Android.mk
index 0214305f..2c4f18c5 100644
--- a/tests/lldb/cpp/WaitAttach/Android.mk
+++ b/tests/lldb/cpp/WaitAttach/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE := CppDebugWaitAttach
 
 LOCAL_SRC_FILES := \
 	WaitAttach.cpp \
-	simple.rs
+	simple.rscript
 
 include frameworks/rs/tests/lldb/cpp/common.mk
 include $(BUILD_EXECUTABLE)
@@ -16,7 +16,7 @@ LOCAL_MODULE := CppNoDebugWaitAttach
 
 LOCAL_SRC_FILES := \
 	WaitAttach.cpp \
-	simple.rs
+	simple.rscript
 
 include frameworks/rs/tests/lldb/cpp/common.mk
 LOCAL_RENDERSCRIPT_FLAGS := $(filter-out -g,$(LOCAL_RENDERSCRIPT_FLAGS))
diff --git a/tests/lldb/cpp/WaitAttach/simple.rs b/tests/lldb/cpp/WaitAttach/simple.rscript
index 1e9780a2..1e9780a2 100644
--- a/tests/lldb/cpp/WaitAttach/simple.rs
+++ b/tests/lldb/cpp/WaitAttach/simple.rscript
diff --git a/tests/lldb/java/Allocations/src/rs/allocs.rs b/tests/lldb/java/Allocations/src/rs/allocs.rscript
index 0ec39c52..0ec39c52 100644
--- a/tests/lldb/java/Allocations/src/rs/allocs.rs
+++ b/tests/lldb/java/Allocations/src/rs/allocs.rscript
diff --git a/tests/lldb/java/BranchingFunCalls/src/rs/scalars.rs b/tests/lldb/java/BranchingFunCalls/src/rs/scalars.rscript
index 7206330d..7206330d 100644
--- a/tests/lldb/java/BranchingFunCalls/src/rs/scalars.rs
+++ b/tests/lldb/java/BranchingFunCalls/src/rs/scalars.rscript
diff --git a/tests/lldb/java/DebugWaitAttach/src/rs/simple.rs b/tests/lldb/java/DebugWaitAttach/src/rs/simple.rscript
index 6b564c0f..6b564c0f 100644
--- a/tests/lldb/java/DebugWaitAttach/src/rs/simple.rs
+++ b/tests/lldb/java/DebugWaitAttach/src/rs/simple.rscript
diff --git a/tests/lldb/java/InfiniteLoop/src/com/android/rs/infiniteloop/infiniteloop.rs b/tests/lldb/java/InfiniteLoop/src/com/android/rs/infiniteloop/infiniteloop.rscript
index 5042ebfa..5042ebfa 100644
--- a/tests/lldb/java/InfiniteLoop/src/com/android/rs/infiniteloop/infiniteloop.rs
+++ b/tests/lldb/java/InfiniteLoop/src/com/android/rs/infiniteloop/infiniteloop.rscript
diff --git a/tests/lldb/java/KernelVariables/src/rs/simple.rs b/tests/lldb/java/KernelVariables/src/rs/simple.rscript
index 26b6affc..26b6affc 100644
--- a/tests/lldb/java/KernelVariables/src/rs/simple.rs
+++ b/tests/lldb/java/KernelVariables/src/rs/simple.rscript
diff --git a/tests/lldb/java/MultipleRSFiles/src/rs/first.rs b/tests/lldb/java/MultipleRSFiles/src/rs/first.rscript
index cbed426f..cbed426f 100644
--- a/tests/lldb/java/MultipleRSFiles/src/rs/first.rs
+++ b/tests/lldb/java/MultipleRSFiles/src/rs/first.rscript
diff --git a/tests/lldb/java/MultipleRSFiles/src/rs/second.rs b/tests/lldb/java/MultipleRSFiles/src/rs/second.rscript
index c87d7ae0..c87d7ae0 100644
--- a/tests/lldb/java/MultipleRSFiles/src/rs/second.rs
+++ b/tests/lldb/java/MultipleRSFiles/src/rs/second.rscript
diff --git a/tests/lldb/java/NoDebugWaitAttach/src/rs/simple.rs b/tests/lldb/java/NoDebugWaitAttach/src/rs/simple.rscript
index 6652675c..6652675c 100644
--- a/tests/lldb/java/NoDebugWaitAttach/src/rs/simple.rs
+++ b/tests/lldb/java/NoDebugWaitAttach/src/rs/simple.rscript
diff --git a/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce.rs b/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce.rscript
index c8fb088a..c8fb088a 100644
--- a/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce.rs
+++ b/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce.rscript
diff --git a/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce_auto_comb.rs b/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce_auto_comb.rscript
index 5a9de904..5a9de904 100644
--- a/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce_auto_comb.rs
+++ b/tests/lldb/java/Reduction/src/com/android/rs/lldbreductiontest/reduce_auto_comb.rscript
diff --git a/tests/lldb/java/ScriptGroup/src/rs/scriptgroup.rs b/tests/lldb/java/ScriptGroup/src/rs/scriptgroup.rscript
index 29089e10..29089e10 100644
--- a/tests/lldb/java/ScriptGroup/src/rs/scriptgroup.rs
+++ b/tests/lldb/java/ScriptGroup/src/rs/scriptgroup.rscript
diff --git a/tests/lldb/java/SingleSource/src/rs/rs_single_source.rs b/tests/lldb/java/SingleSource/src/rs/rs_single_source.rscript
index 15c35ef2..15c35ef2 100644
--- a/tests/lldb/java/SingleSource/src/rs/rs_single_source.rs
+++ b/tests/lldb/java/SingleSource/src/rs/rs_single_source.rscript
diff --git a/tests/lldb/jni/Allocations/jniallocations/Android.mk b/tests/lldb/jni/Allocations/jniallocations/Android.mk
index 2493be1d..e5c28635 100644
--- a/tests/lldb/jni/Allocations/jniallocations/Android.mk
+++ b/tests/lldb/jni/Allocations/jniallocations/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjniallocations
 
-LOCAL_SRC_FILES := jniallocations.cpp allocs.rs
+LOCAL_SRC_FILES := jniallocations.cpp allocs.rscript
 
 LOCAL_RENDERSCRIPT_FLAGS := -g
 
diff --git a/tests/lldb/jni/Allocations/jniallocations/allocs.rs b/tests/lldb/jni/Allocations/jniallocations/allocs.rscript
index c5ebcbfc..c5ebcbfc 100644
--- a/tests/lldb/jni/Allocations/jniallocations/allocs.rs
+++ b/tests/lldb/jni/Allocations/jniallocations/allocs.rscript
diff --git a/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk b/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk
index c04cc19a..34dd1add 100644
--- a/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk
+++ b/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjnibranchingfuncalls
 
-LOCAL_SRC_FILES := jnibranchingfuncalls.cpp scalars.rs
+LOCAL_SRC_FILES := jnibranchingfuncalls.cpp scalars.rscript
 
 LOCAL_RENDERSCRIPT_FLAGS := -g
 
diff --git a/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/scalars.rs b/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/scalars.rscript
index b98df28b..b98df28b 100644
--- a/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/scalars.rs
+++ b/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/scalars.rscript
diff --git a/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk b/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk
index c1df28ca..edb348fc 100644
--- a/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk
+++ b/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjnidebugwaitattach
 
-LOCAL_SRC_FILES := jnidebugwaitattach.cpp simple.rs
+LOCAL_SRC_FILES := jnidebugwaitattach.cpp simple.rscript
 
 LOCAL_RENDERSCRIPT_FLAGS := -g
 
diff --git a/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/simple.rs b/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/simple.rscript
index a89c1f21..a89c1f21 100644
--- a/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/simple.rs
+++ b/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/simple.rscript
diff --git a/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk b/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk
index dfc12071..31001d00 100644
--- a/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk
+++ b/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjniinfiniteloop
 
-LOCAL_SRC_FILES := jniinfiniteloop.cpp infiniteloop.rs
+LOCAL_SRC_FILES := jniinfiniteloop.cpp infiniteloop.rscript
 
 LOCAL_RENDERSCRIPT_FLAGS := -g
 
diff --git a/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/infiniteloop.rs b/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/infiniteloop.rscript
index 142b27ba..142b27ba 100644
--- a/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/infiniteloop.rs
+++ b/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/infiniteloop.rscript
diff --git a/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk b/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk
index 9088f7ef..fe372a74 100644
--- a/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk
+++ b/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjnikernelvariables
 
-LOCAL_SRC_FILES := jnikernelvariables.cpp simple.rs
+LOCAL_SRC_FILES := jnikernelvariables.cpp simple.rscript
 
 LOCAL_RENDERSCRIPT_FLAGS := -g
 
diff --git a/tests/lldb/jni/KernelVariables/jnikernelvariables/simple.rs b/tests/lldb/jni/KernelVariables/jnikernelvariables/simple.rscript
index 30feb005..30feb005 100644
--- a/tests/lldb/jni/KernelVariables/jnikernelvariables/simple.rs
+++ b/tests/lldb/jni/KernelVariables/jnikernelvariables/simple.rscript
diff --git a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk
index 8d6125e8..6fd4b10a 100644
--- a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk
+++ b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjnimultiplersfiles
 
-LOCAL_SRC_FILES := jnimultiplersfiles.cpp first.rs second.rs
+LOCAL_SRC_FILES := jnimultiplersfiles.cpp first.rscript second.rscript
 
 LOCAL_RENDERSCRIPT_FLAGS := -g
 
diff --git a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/first.rs b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/first.rscript
index 7c4a8520..7c4a8520 100644
--- a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/first.rs
+++ b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/first.rscript
diff --git a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/second.rs b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/second.rscript
index ab898f90..ab898f90 100644
--- a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/second.rs
+++ b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/second.rscript
diff --git a/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk b/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk
index 91313d56..fda6fcf9 100644
--- a/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk
+++ b/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libjninodebugwaitattach
 
-LOCAL_SRC_FILES := jninodebugwaitattach.cpp simple.rs
+LOCAL_SRC_FILES := jninodebugwaitattach.cpp simple.rscript
 
 include frameworks/rs/tests/lldb/jni/common.mk
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/simple.rs b/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/simple.rscript
index c55e0b51..c55e0b51 100644
--- a/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/simple.rs
+++ b/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/simple.rscript