Merge "release-request-8a6a1d17-d673-453b-8612-ea961499cd38-for-aosp-oreo-cts-release-4341710 snap-temp-L24800000103383547" into oreo-cts-release
diff --git a/renderscript/lib/arm/libRSSupport.so b/renderscript/lib/arm/libRSSupport.so
index 7f326aa..1aac82a 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 705eb63..b063bd3 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 5fe9e8f..423faec 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 0154392..b979282 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 2741b1f..62b1257 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 355b865..2b947bd 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 9aa7b96..733d51b 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 4ab5774..da1c73c 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 576aed8..30b7cd7 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 66f69ac..cba3a3b 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 ad86c46..ba427c5 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 575f029..5ac60a1 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 520335a..4b85991 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 d455862..f28cf32 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 e8dba32..f666aa7 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 4224d09..b753fd9 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 39bf7c4..2e2cd8d 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 02f0ad1..c3794f2 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 cd3fb9a..2c2640c 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 00f5a61..6e28f2c 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 20cee07..9d9325d 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 d0f24a8..131cd3c 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 f7105d7..daa048b 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 612b528..42b4957 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 e414366..cb80895 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 8eb7819..d8c1b89 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 d4cdcd6..63ee7a0 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 0461d97..de6d376 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 582270f..599ee08 100755
--- a/renderscript/lib/x86/librsjni.so
+++ b/renderscript/lib/x86/librsjni.so
Binary files differ
diff --git a/renderscript/lib/x86_64/libRSSupport.so b/renderscript/lib/x86_64/libRSSupport.so
index a3e8441..5aed51a 100755
--- a/renderscript/lib/x86_64/libRSSupport.so
+++ b/renderscript/lib/x86_64/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/x86_64/libRSSupportIO.so b/renderscript/lib/x86_64/libRSSupportIO.so
index 9da417f..d9b6348 100755
--- a/renderscript/lib/x86_64/libRSSupportIO.so
+++ b/renderscript/lib/x86_64/libRSSupportIO.so
Binary files differ
diff --git a/renderscript/lib/x86_64/libblasV8.so b/renderscript/lib/x86_64/libblasV8.so
index cd49d69..7931caf 100644
--- a/renderscript/lib/x86_64/libblasV8.so
+++ b/renderscript/lib/x86_64/libblasV8.so
Binary files differ
diff --git a/renderscript/lib/x86_64/libc.so b/renderscript/lib/x86_64/libc.so
index f0b1a15..aa6a6d4 100755
--- a/renderscript/lib/x86_64/libc.so
+++ b/renderscript/lib/x86_64/libc.so
Binary files differ
diff --git a/renderscript/lib/x86_64/libcompiler_rt.a b/renderscript/lib/x86_64/libcompiler_rt.a
index 1600312..b500a15 100644
--- a/renderscript/lib/x86_64/libcompiler_rt.a
+++ b/renderscript/lib/x86_64/libcompiler_rt.a
Binary files differ
diff --git a/renderscript/lib/x86_64/libm.so b/renderscript/lib/x86_64/libm.so
index 6df044e..1e8ce2b 100755
--- a/renderscript/lib/x86_64/libm.so
+++ b/renderscript/lib/x86_64/libm.so
Binary files differ
diff --git a/renderscript/lib/x86_64/librsjni.so b/renderscript/lib/x86_64/librsjni.so
index 20c455a..18f755f 100755
--- a/renderscript/lib/x86_64/librsjni.so
+++ b/renderscript/lib/x86_64/librsjni.so
Binary files differ
diff --git a/sdk-annotations/README.txt b/sdk-annotations/README.txt
index c4342b6..b926481 100644
--- a/sdk-annotations/README.txt
+++ b/sdk-annotations/README.txt
@@ -1,5 +1,5 @@
 Generated from tools/adt/idea CL
-234839667c6912ff7eaccd9102525d0ba495c886
+Id8df826530d9a201987de9701dba53307c5d5c6f
 
 (by building the Android Studio tree by running ./build_studio.sh
 in tools/idea, then copying the resulting androidAnnotations.jar
diff --git a/sdk-annotations/annotations.zip b/sdk-annotations/annotations.zip
index 468227c..fcd86d7 100644
--- a/sdk-annotations/annotations.zip
+++ b/sdk-annotations/annotations.zip
Binary files differ
diff --git a/tools/darwin/bin/bcc_compat b/tools/darwin/bin/bcc_compat
index cef3aa6..731ab4e 100755
--- a/tools/darwin/bin/bcc_compat
+++ b/tools/darwin/bin/bcc_compat
Binary files differ
diff --git a/tools/darwin/bin/llvm-rs-cc b/tools/darwin/bin/llvm-rs-cc
index a969a68..6c438f8 100755
--- a/tools/darwin/bin/llvm-rs-cc
+++ b/tools/darwin/bin/llvm-rs-cc
Binary files differ
diff --git a/tools/darwin/lib64/libLLVM.dylib b/tools/darwin/lib64/libLLVM.dylib
index 2f83344..3f5062a 100755
--- a/tools/darwin/lib64/libLLVM.dylib
+++ b/tools/darwin/lib64/libLLVM.dylib
Binary files differ
diff --git a/tools/darwin/lib64/libbcc.dylib b/tools/darwin/lib64/libbcc.dylib
index 6b3c07f..232905b 100755
--- a/tools/darwin/lib64/libbcc.dylib
+++ b/tools/darwin/lib64/libbcc.dylib
Binary files differ
diff --git a/tools/darwin/lib64/libbcinfo.dylib b/tools/darwin/lib64/libbcinfo.dylib
index 77a2a1c..9f766bc 100755
--- a/tools/darwin/lib64/libbcinfo.dylib
+++ b/tools/darwin/lib64/libbcinfo.dylib
Binary files differ
diff --git a/tools/darwin/lib64/libc++.dylib b/tools/darwin/lib64/libc++.dylib
index 5fed29b..f40fee0 100755
--- a/tools/darwin/lib64/libc++.dylib
+++ b/tools/darwin/lib64/libc++.dylib
Binary files differ
diff --git a/tools/darwin/lib64/libclang.dylib b/tools/darwin/lib64/libclang.dylib
index 176804e..fc9da5e 100755
--- a/tools/darwin/lib64/libclang.dylib
+++ b/tools/darwin/lib64/libclang.dylib
Binary files differ
diff --git a/tools/linux/bin/bcc_compat b/tools/linux/bin/bcc_compat
index 78476b5..17c30b7 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 a2a1e63..fb3ec23 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 824b667..73f76b5 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 d718742..a75b2e9 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 359e79c..b062978 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 245b696..43501a0 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 42eabe1..3fb7acd 100755
--- a/tools/linux/lib64/libc++.so
+++ b/tools/linux/lib64/libc++.so
Binary files differ