diff --git a/renderscript/include/rs_for_each.rsh b/renderscript/include/rs_for_each.rsh
index 1bbcf9f..9507c0c 100644
--- a/renderscript/include/rs_for_each.rsh
+++ b/renderscript/include/rs_for_each.rsh
@@ -57,8 +57,8 @@
  * A kernel may be executed in parallel over multiple threads.  Each thread will have its
  * own context.
  *
- * You can access the context by adding a rs_kernel_context argument to your kernel
- * function.  See rsGetDimX() and rsGetArray0() for examples.
+ * You can access the context by adding a special parameter named "context" and of type
+ * rs_kernel_context to your kernel function.  See rsGetDimX() and rsGetArray0() for examples.
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 typedef const struct rs_kernel_context_t * rs_kernel_context;
@@ -161,8 +161,8 @@
  * It contains common characteristics of the allocations being iterated over and rarely
  * used indexes, like the Array0 index.
  *
- * You can access the context by adding a rs_kernel_context argument to your kernel
- * function.  E.g.
+ * You can access the context by adding a special parameter named "context" and of
+ * type rs_kernel_context to your kernel function.  E.g.
  * short RS_KERNEL myKernel(short value, uint32_t x, rs_kernel_context context) {
  *   // The current index in the common x, y, z, w dimensions are accessed by
  *   // adding these variables as arguments.  For the more rarely used indexes
@@ -175,7 +175,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetArray0(rs_kernel_context ctxt);
+    rsGetArray0(rs_kernel_context context);
 #endif
 
 /*
@@ -188,7 +188,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetArray1(rs_kernel_context ctxt);
+    rsGetArray1(rs_kernel_context context);
 #endif
 
 /*
@@ -202,7 +202,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetArray2(rs_kernel_context ctxt);
+    rsGetArray2(rs_kernel_context context);
 #endif
 
 /*
@@ -215,7 +215,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetArray3(rs_kernel_context ctxt);
+    rsGetArray3(rs_kernel_context context);
 #endif
 
 /*
@@ -228,7 +228,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimArray0(rs_kernel_context ctxt);
+    rsGetDimArray0(rs_kernel_context context);
 #endif
 
 /*
@@ -241,7 +241,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimArray1(rs_kernel_context ctxt);
+    rsGetDimArray1(rs_kernel_context context);
 #endif
 
 /*
@@ -254,7 +254,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimArray2(rs_kernel_context ctxt);
+    rsGetDimArray2(rs_kernel_context context);
 #endif
 
 /*
@@ -267,7 +267,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimArray3(rs_kernel_context ctxt);
+    rsGetDimArray3(rs_kernel_context context);
 #endif
 
 /*
@@ -283,7 +283,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern bool __attribute__((overloadable))
-    rsGetDimHasFaces(rs_kernel_context ctxt);
+    rsGetDimHasFaces(rs_kernel_context context);
 #endif
 
 /*
@@ -299,7 +299,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimLod(rs_kernel_context ctxt);
+    rsGetDimLod(rs_kernel_context context);
 #endif
 
 /*
@@ -311,8 +311,8 @@
  * characteristics of the allocations being iterated over by the kernel in
  * a very efficient structure.  It also contains rarely used indexes.
  *
- * You can access it by adding a rs_kernel_context argument to your kernel
- * function.  E.g.
+ * You can access it by adding a special parameter named "context" and of
+ * type rs_kernel_context to your kernel function.  E.g.
  * int4 RS_KERNEL myKernel(int4 value, rs_kernel_context context) {
  *   uint32_t size = rsGetDimX(context); //...
  *
@@ -320,7 +320,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimX(rs_kernel_context ctxt);
+    rsGetDimX(rs_kernel_context context);
 #endif
 
 /*
@@ -335,7 +335,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimY(rs_kernel_context ctxt);
+    rsGetDimY(rs_kernel_context context);
 #endif
 
 /*
@@ -350,7 +350,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetDimZ(rs_kernel_context ctxt);
+    rsGetDimZ(rs_kernel_context context);
 #endif
 
 /*
@@ -364,7 +364,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern rs_allocation_cubemap_face __attribute__((overloadable))
-    rsGetFace(rs_kernel_context ctxt);
+    rsGetFace(rs_kernel_context context);
 #endif
 
 /*
@@ -378,7 +378,7 @@
  */
 #if (defined(RS_VERSION) && (RS_VERSION >= 23))
 extern uint32_t __attribute__((overloadable))
-    rsGetLod(rs_kernel_context ctxt);
+    rsGetLod(rs_kernel_context context);
 #endif
 
 #endif // RENDERSCRIPT_RS_FOR_EACH_RSH
diff --git a/renderscript/lib/arm/libRSSupport.so b/renderscript/lib/arm/libRSSupport.so
index c6573ba..bfb268d 100755
--- a/renderscript/lib/arm/libRSSupport.so
+++ b/renderscript/lib/arm/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/arm/libRSSupportIO.so b/renderscript/lib/arm/libRSSupportIO.so
index b02cf8a..6b0ee5c 100755
--- a/renderscript/lib/arm/libRSSupportIO.so
+++ b/renderscript/lib/arm/libRSSupportIO.so
Binary files differ
diff --git a/renderscript/lib/arm/libblasV8.so b/renderscript/lib/arm/libblasV8.so
index f892069..ddfae57 100644
--- a/renderscript/lib/arm/libblasV8.so
+++ b/renderscript/lib/arm/libblasV8.so
Binary files differ
diff --git a/renderscript/lib/arm/libc.so b/renderscript/lib/arm/libc.so
index d7c1026..b07b315 100755
--- a/renderscript/lib/arm/libc.so
+++ b/renderscript/lib/arm/libc.so
Binary files differ
diff --git a/renderscript/lib/arm/libcompiler_rt.a b/renderscript/lib/arm/libcompiler_rt.a
index d1c63c9..79a5761 100644
--- a/renderscript/lib/arm/libcompiler_rt.a
+++ b/renderscript/lib/arm/libcompiler_rt.a
Binary files differ
diff --git a/renderscript/lib/arm/libm.so b/renderscript/lib/arm/libm.so
index 2f75369..9e8ece9 100755
--- a/renderscript/lib/arm/libm.so
+++ b/renderscript/lib/arm/libm.so
Binary files differ
diff --git a/renderscript/lib/arm/librsjni.so b/renderscript/lib/arm/librsjni.so
index 6a1e95a..7100dd0 100755
--- a/renderscript/lib/arm/librsjni.so
+++ b/renderscript/lib/arm/librsjni.so
Binary files differ
diff --git a/renderscript/lib/arm64/libRSSupport.so b/renderscript/lib/arm64/libRSSupport.so
index 4d2e134..510228f 100755
--- a/renderscript/lib/arm64/libRSSupport.so
+++ b/renderscript/lib/arm64/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/arm64/libRSSupportIO.so b/renderscript/lib/arm64/libRSSupportIO.so
index bed9710..1d05755 100755
--- a/renderscript/lib/arm64/libRSSupportIO.so
+++ b/renderscript/lib/arm64/libRSSupportIO.so
Binary files differ
diff --git a/renderscript/lib/arm64/libblasV8.so b/renderscript/lib/arm64/libblasV8.so
index f32eb20..76505bf 100644
--- a/renderscript/lib/arm64/libblasV8.so
+++ b/renderscript/lib/arm64/libblasV8.so
Binary files differ
diff --git a/renderscript/lib/arm64/libc.so b/renderscript/lib/arm64/libc.so
index 14c5449..72ed27f 100755
--- a/renderscript/lib/arm64/libc.so
+++ b/renderscript/lib/arm64/libc.so
Binary files differ
diff --git a/renderscript/lib/arm64/libcompiler_rt.a b/renderscript/lib/arm64/libcompiler_rt.a
index 07148a9..8dcfe8c 100644
--- a/renderscript/lib/arm64/libcompiler_rt.a
+++ b/renderscript/lib/arm64/libcompiler_rt.a
Binary files differ
diff --git a/renderscript/lib/arm64/libm.so b/renderscript/lib/arm64/libm.so
index 3c6897e..7866a42 100755
--- a/renderscript/lib/arm64/libm.so
+++ b/renderscript/lib/arm64/libm.so
Binary files differ
diff --git a/renderscript/lib/arm64/librsjni.so b/renderscript/lib/arm64/librsjni.so
index c63fa06..d353888 100755
--- a/renderscript/lib/arm64/librsjni.so
+++ b/renderscript/lib/arm64/librsjni.so
Binary files differ
diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar
index a73ef8e..8f4ef8d 100644
--- a/renderscript/lib/javalib.jar
+++ b/renderscript/lib/javalib.jar
Binary files differ
diff --git a/renderscript/lib/mips/libRSSupport.so b/renderscript/lib/mips/libRSSupport.so
index b76c39f..e13e354 100755
--- a/renderscript/lib/mips/libRSSupport.so
+++ b/renderscript/lib/mips/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/mips/libRSSupportIO.so b/renderscript/lib/mips/libRSSupportIO.so
index f1ad47a..0f1dbdf 100755
--- a/renderscript/lib/mips/libRSSupportIO.so
+++ b/renderscript/lib/mips/libRSSupportIO.so
Binary files differ
diff --git a/renderscript/lib/mips/libblasV8.so b/renderscript/lib/mips/libblasV8.so
index 5fcb585..f170db8 100644
--- a/renderscript/lib/mips/libblasV8.so
+++ b/renderscript/lib/mips/libblasV8.so
Binary files differ
diff --git a/renderscript/lib/mips/libc.so b/renderscript/lib/mips/libc.so
index 69e574f..5d44437 100755
--- a/renderscript/lib/mips/libc.so
+++ b/renderscript/lib/mips/libc.so
Binary files differ
diff --git a/renderscript/lib/mips/libcompiler_rt.a b/renderscript/lib/mips/libcompiler_rt.a
index 337ca15..d4994a9 100644
--- a/renderscript/lib/mips/libcompiler_rt.a
+++ b/renderscript/lib/mips/libcompiler_rt.a
Binary files differ
diff --git a/renderscript/lib/mips/libm.so b/renderscript/lib/mips/libm.so
index d33f7f1..f2d12d1 100755
--- a/renderscript/lib/mips/libm.so
+++ b/renderscript/lib/mips/libm.so
Binary files differ
diff --git a/renderscript/lib/mips/librsjni.so b/renderscript/lib/mips/librsjni.so
index 71723eb..278cbb2 100755
--- a/renderscript/lib/mips/librsjni.so
+++ b/renderscript/lib/mips/librsjni.so
Binary files differ
diff --git a/renderscript/lib/x86/libRSSupport.so b/renderscript/lib/x86/libRSSupport.so
index 818f176..da58775 100755
--- a/renderscript/lib/x86/libRSSupport.so
+++ b/renderscript/lib/x86/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/x86/libRSSupportIO.so b/renderscript/lib/x86/libRSSupportIO.so
index 8bd6d79..96075a3 100755
--- a/renderscript/lib/x86/libRSSupportIO.so
+++ b/renderscript/lib/x86/libRSSupportIO.so
Binary files differ
diff --git a/renderscript/lib/x86/libblasV8.so b/renderscript/lib/x86/libblasV8.so
index 09c8c50..c004d1f 100644
--- a/renderscript/lib/x86/libblasV8.so
+++ b/renderscript/lib/x86/libblasV8.so
Binary files differ
diff --git a/renderscript/lib/x86/libc.so b/renderscript/lib/x86/libc.so
index 32dd59d..bdf4744 100755
--- a/renderscript/lib/x86/libc.so
+++ b/renderscript/lib/x86/libc.so
Binary files differ
diff --git a/renderscript/lib/x86/libcompiler_rt.a b/renderscript/lib/x86/libcompiler_rt.a
index 3773709..1b5a42f 100644
--- a/renderscript/lib/x86/libcompiler_rt.a
+++ b/renderscript/lib/x86/libcompiler_rt.a
Binary files differ
diff --git a/renderscript/lib/x86/libm.so b/renderscript/lib/x86/libm.so
index c529738..b0c2071 100755
--- a/renderscript/lib/x86/libm.so
+++ b/renderscript/lib/x86/libm.so
Binary files differ
diff --git a/renderscript/lib/x86/librsjni.so b/renderscript/lib/x86/librsjni.so
index 0822d1f..0789b35 100755
--- a/renderscript/lib/x86/librsjni.so
+++ b/renderscript/lib/x86/librsjni.so
Binary files differ
diff --git a/tools/linux/bin/bcc_compat b/tools/linux/bin/bcc_compat
index 27c1d68..d9e408c 100755
--- a/tools/linux/bin/bcc_compat
+++ b/tools/linux/bin/bcc_compat
Binary files differ
diff --git a/tools/linux/bin/llvm-rs-cc b/tools/linux/bin/llvm-rs-cc
index 6847b64..540e6c8 100755
--- a/tools/linux/bin/llvm-rs-cc
+++ b/tools/linux/bin/llvm-rs-cc
Binary files differ
diff --git a/tools/linux/lib/libc++.so b/tools/linux/lib/libc++.so
index 3e6de69..cb0d387 100755
--- a/tools/linux/lib/libc++.so
+++ b/tools/linux/lib/libc++.so
Binary files differ
diff --git a/tools/linux/lib64/libLLVM.so b/tools/linux/lib64/libLLVM.so
index ee0dd96..eeaeaa0 100755
--- a/tools/linux/lib64/libLLVM.so
+++ b/tools/linux/lib64/libLLVM.so
Binary files differ
diff --git a/tools/linux/lib64/libbcc.so b/tools/linux/lib64/libbcc.so
index 64f8338..5ccd791 100755
--- a/tools/linux/lib64/libbcc.so
+++ b/tools/linux/lib64/libbcc.so
Binary files differ
diff --git a/tools/linux/lib64/libbcinfo.so b/tools/linux/lib64/libbcinfo.so
index 474f7bb..a3d5644 100755
--- a/tools/linux/lib64/libbcinfo.so
+++ b/tools/linux/lib64/libbcinfo.so
Binary files differ
diff --git a/tools/linux/lib64/libc++.so b/tools/linux/lib64/libc++.so
index e891ec5..fe09e75 100755
--- a/tools/linux/lib64/libc++.so
+++ b/tools/linux/lib64/libc++.so
Binary files differ
diff --git a/tools/linux/lib64/libclang.so b/tools/linux/lib64/libclang.so
index 29b71fb..0840096 100755
--- a/tools/linux/lib64/libclang.so
+++ b/tools/linux/lib64/libclang.so
Binary files differ