diff --git a/aapt b/aapt
index 37548f0..9141568 100755
--- a/aapt
+++ b/aapt
Binary files differ
diff --git a/dexdump b/dexdump
index 45f24a4..6672874 100755
--- a/dexdump
+++ b/dexdump
Binary files differ
diff --git a/jack.jar b/jack.jar
new file mode 100644
index 0000000..add4278
--- /dev/null
+++ b/jack.jar
Binary files differ
diff --git a/jill.jar b/jill.jar
new file mode 100644
index 0000000..80ff255
--- /dev/null
+++ b/jill.jar
Binary files differ
diff --git a/lib/cc.dylib b/lib/cc.dylib
index 6114ee0..098eea2 100644
--- a/lib/cc.dylib
+++ b/lib/cc.dylib
Binary files differ
diff --git a/lib/cinfo.dylib b/lib/cinfo.dylib
index 82e2970..ae66222 100644
--- a/lib/cinfo.dylib
+++ b/lib/cinfo.dylib
Binary files differ
diff --git a/lib/dx.jar b/lib/dx.jar
index f456278..0b61dfa 100644
--- a/lib/dx.jar
+++ b/lib/dx.jar
Binary files differ
diff --git a/lib/shrinkedAndroid.jar b/lib/shrinkedAndroid.jar
new file mode 100644
index 0000000..b485061
--- /dev/null
+++ b/lib/shrinkedAndroid.jar
Binary files differ
diff --git a/libbcc.dylib b/libbcc.dylib
index 6114ee0..098eea2 100755
--- a/libbcc.dylib
+++ b/libbcc.dylib
Binary files differ
diff --git a/libbcinfo.dylib b/libbcinfo.dylib
index 82e2970..ae66222 100755
--- a/libbcinfo.dylib
+++ b/libbcinfo.dylib
Binary files differ
diff --git a/llvm-rs-cc b/llvm-rs-cc
index cc589b6..6ea3098 100755
--- a/llvm-rs-cc
+++ b/llvm-rs-cc
Binary files differ
diff --git a/mainDexClasses b/mainDexClasses
new file mode 100644
index 0000000..034d47e
--- /dev/null
+++ b/mainDexClasses
@@ -0,0 +1,158 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+function makeTempJar ()
+{
+  local tempDir=/tmp
+  if [ ! -e "${tempDir}" ]; then
+    tempDir=.
+  fi
+  local tempfile="${tempDir}/mainDexClasses-$$.tmp.jar"
+  if [ -e "${tempfile}" ]; then
+    echo "Failed to create temporary file" >2
+    exit 6
+  fi
+  echo "${tempfile}"
+}
+
+function cleanTmp ()
+{
+  if [ -e "${tmpOut}" ] ; then
+    rm "${tmpOut}"
+  fi
+}
+
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+
+while [ -h "${prog}" ]; do
+    newProg=`/bin/ls -ld "${prog}"`
+    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+    if expr "x${newProg}" : 'x/' >/dev/null; then
+        prog="${newProg}"
+    else
+        progdir=`dirname "${prog}"`
+        prog="${progdir}/${newProg}"
+    fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+baserules="${progdir}"/mainDexClasses.rules
+if [ ! -r ${baserules} ]; then
+    echo `basename "$prog"`": can't find mainDexClasses.rules" 1>&2
+    exit 1
+fi
+
+jarfile=dx.jar
+libdir="$progdir"
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    # set dx.jar location for the SDK case
+    libdir="$libdir/lib"
+fi
+
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    # set dx.jar location for the Android tree case
+    libdir=`dirname "$progdir"`/framework
+fi
+
+if [ ! -r "$libdir/$jarfile" ]; then
+    echo `basename "$prog"`": can't find $jarfile" 1>&2
+    exit 1
+fi
+
+proguardExec="proguard.sh"
+proguard=${PROGUARD_HOME}/bin/${proguardExec}
+
+if [ ! -r "${proguard}" ]; then
+  # set proguard location for the SDK case
+  proguardBaseDir=`dirname "$progdir"`
+  # "${progdir}"/../..
+  proguardBaseDir=`dirname "$proguardBaseDir"`
+  proguard="${proguardBaseDir}"/tools/proguard/bin/${proguardExec}
+fi
+
+if [ ! -r "${proguard}" ]; then
+  # set proguard location for the Android tree case
+  proguardBaseDir=`dirname "$proguardBaseDir"`
+  # "${progdir}"/../../../..
+  proguardBaseDir=`dirname "$proguardBaseDir"`
+  proguard="${proguardBaseDir}"/external/proguard/bin/${proguardExec}
+fi
+
+if [ ! -r "${proguard}" ]; then
+    proguard="`which proguard`"
+fi
+
+if [ -z "${proguard}" -o ! -r "${proguard}" ]; then
+    proguard="`which ${proguardExec}`"
+fi
+
+if [ -z "${proguard}" -o ! -r "${proguard}" ]; then
+    echo `basename "$prog"`": can't find ${proguardExec}" 1>&2
+    exit 1
+fi
+
+shrinkedAndroidJar="${SHRINKED_ANDROID_JAR}"
+if [ -z "${shrinkedAndroidJar}" ]; then
+  shrinkedAndroidJar=shrinkedAndroid.jar
+fi
+
+if [ ! -r "${shrinkedAndroidJar}" ]; then
+  shrinkedAndroidJar=${libdir}/${shrinkedAndroidJar}
+fi
+
+if [ ! -r "${shrinkedAndroidJar}" ]; then
+    echo `basename "$prog"`": can't find shrinkedAndroid.jar" 1>&2
+    exit 1
+fi
+
+if [ "$OSTYPE" = "cygwin" ]; then
+    # For Cygwin, convert the jarfile path into native Windows style.
+    jarpath=`cygpath -w "$libdir/$jarfile"`
+  proguard=`cygpath -w "${proguard}"`
+  shrinkedAndroidJar=`cygpath -w "${shrinkedAndroidJar}"`
+else
+    jarpath="$libdir/$jarfile"
+fi
+
+if expr "x$1" : 'x--output' >/dev/null; then
+    exec 1>$2
+    shift 2
+fi
+
+if [ $# -ne 1 ]; then
+  echo "Usage : $0 [--output <output file>] <application path>" 1>&2
+  exit 2
+fi
+
+tmpOut=`makeTempJar`
+
+trap cleanTmp 0
+
+${proguard} -injars ${@} -dontwarn -forceprocessing  -outjars ${tmpOut} \
+  -libraryjars "${shrinkedAndroidJar}" -dontoptimize -dontobfuscate -dontpreverify \
+  -include "${baserules}" 1>/dev/null || exit 10
+
+java -cp "$jarpath" com.android.multidex.ClassReferenceListBuilder "${tmpOut}" ${@} ||  exit 11
diff --git a/mainDexClasses.rules b/mainDexClasses.rules
new file mode 100644
index 0000000..af4085a
--- /dev/null
+++ b/mainDexClasses.rules
@@ -0,0 +1,27 @@
+  -keep public class * extends android.app.Instrumentation {
+    <init>();
+  }
+  -keep public class * extends android.app.Application {
+    <init>();
+    void attachBaseContext(android.content.Context);
+  }
+  -keep public class * extends android.app.Activity {
+    <init>();
+  }
+  -keep public class * extends android.app.Service {
+    <init>();
+  }
+  -keep public class * extends android.content.ContentProvider {
+   <init>();
+  }
+  -keep public class * extends android.content.BroadcastReceiver {
+   <init>();
+  }
+  -keep public class * extends android.app.backup.BackupAgent {
+   <init>();
+  }
+# We need to keep all annotation classes because proguard does not trace annotation attribute
+# it just filter the annotation attributes according to annotation classes it already kept.
+  -keep public class * extends java.lang.annotation.Annotation {
+   *;
+  }
diff --git a/renderscript/include/rs_allocation.rsh b/renderscript/include/rs_allocation.rsh
index 6f3f8d9..cdf64e8 100644
--- a/renderscript/include/rs_allocation.rsh
+++ b/renderscript/include/rs_allocation.rsh
@@ -374,8 +374,8 @@
 
 #endif // (defined(RS_VERSION) && (RS_VERSION >= 18))
 
-
-#if (defined(RS_VERSION) && (RS_VERSION >= 999))
+// FIXME: this needs to be set to 22
+#if (defined(RS_VERSION) && (RS_VERSION >= 21))
 
 #define VOP(T)                                                                   \
     extern T __attribute__((overloadable))                                       \
@@ -424,7 +424,8 @@
 
 #undef VOP
 
-#endif //(defined(RS_VERSION) && (RS_VERSION >= 999))
+// FIXME
+#endif //(defined(RS_VERSION) && (RS_VERSION >= 21))
 
 
 #endif
diff --git a/renderscript/lib/bc/armeabi-v7a/libclcore.bc b/renderscript/lib/bc/armeabi-v7a/libclcore.bc
index 34cbe63..ddb5263 100644
--- a/renderscript/lib/bc/armeabi-v7a/libclcore.bc
+++ b/renderscript/lib/bc/armeabi-v7a/libclcore.bc
Binary files differ
diff --git a/renderscript/lib/bc/mips/libclcore.bc b/renderscript/lib/bc/mips/libclcore.bc
index 34cbe63..ddb5263 100644
--- a/renderscript/lib/bc/mips/libclcore.bc
+++ b/renderscript/lib/bc/mips/libclcore.bc
Binary files differ
diff --git a/renderscript/lib/bc/x86/libclcore.bc b/renderscript/lib/bc/x86/libclcore.bc
index 76ebb47..6aa69ee 100644
--- a/renderscript/lib/bc/x86/libclcore.bc
+++ b/renderscript/lib/bc/x86/libclcore.bc
Binary files differ
diff --git a/renderscript/lib/intermediates/armeabi-v7a/libc.so b/renderscript/lib/intermediates/armeabi-v7a/libc.so
index 04aee46..03c346e 100644
--- a/renderscript/lib/intermediates/armeabi-v7a/libc.so
+++ b/renderscript/lib/intermediates/armeabi-v7a/libc.so
Binary files differ
diff --git a/renderscript/lib/intermediates/armeabi-v7a/libm.so b/renderscript/lib/intermediates/armeabi-v7a/libm.so
index 01d9d4f..96b9091 100644
--- a/renderscript/lib/intermediates/armeabi-v7a/libm.so
+++ b/renderscript/lib/intermediates/armeabi-v7a/libm.so
Binary files differ
diff --git a/renderscript/lib/intermediates/mips/libc.so b/renderscript/lib/intermediates/mips/libc.so
index e3613f6..c611d69 100644
--- a/renderscript/lib/intermediates/mips/libc.so
+++ b/renderscript/lib/intermediates/mips/libc.so
Binary files differ
diff --git a/renderscript/lib/intermediates/mips/libm.so b/renderscript/lib/intermediates/mips/libm.so
index 2d989a2..e07fe68 100644
--- a/renderscript/lib/intermediates/mips/libm.so
+++ b/renderscript/lib/intermediates/mips/libm.so
Binary files differ
diff --git a/renderscript/lib/intermediates/x86/libc.so b/renderscript/lib/intermediates/x86/libc.so
index fb51f4f..3f08c08 100644
--- a/renderscript/lib/intermediates/x86/libc.so
+++ b/renderscript/lib/intermediates/x86/libc.so
Binary files differ
diff --git a/renderscript/lib/intermediates/x86/libm.so b/renderscript/lib/intermediates/x86/libm.so
index 3b4c732..0ef13e2 100644
--- a/renderscript/lib/intermediates/x86/libm.so
+++ b/renderscript/lib/intermediates/x86/libm.so
Binary files differ
diff --git a/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so b/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
index c12750f..619f5d0 100644
--- a/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
+++ b/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/packaged/armeabi-v7a/librsjni.so b/renderscript/lib/packaged/armeabi-v7a/librsjni.so
index f376df6..4b578ee 100644
--- a/renderscript/lib/packaged/armeabi-v7a/librsjni.so
+++ b/renderscript/lib/packaged/armeabi-v7a/librsjni.so
Binary files differ
diff --git a/renderscript/lib/packaged/mips/libRSSupport.so b/renderscript/lib/packaged/mips/libRSSupport.so
index d195cb7..e59849f 100644
--- a/renderscript/lib/packaged/mips/libRSSupport.so
+++ b/renderscript/lib/packaged/mips/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/packaged/mips/librsjni.so b/renderscript/lib/packaged/mips/librsjni.so
index 54e0e11..99c8af7 100644
--- a/renderscript/lib/packaged/mips/librsjni.so
+++ b/renderscript/lib/packaged/mips/librsjni.so
Binary files differ
diff --git a/renderscript/lib/packaged/x86/libRSSupport.so b/renderscript/lib/packaged/x86/libRSSupport.so
index a50fbd9..db3bfe4 100644
--- a/renderscript/lib/packaged/x86/libRSSupport.so
+++ b/renderscript/lib/packaged/x86/libRSSupport.so
Binary files differ
diff --git a/renderscript/lib/packaged/x86/librsjni.so b/renderscript/lib/packaged/x86/librsjni.so
index 5a5bb7f..31e8f35 100644
--- a/renderscript/lib/packaged/x86/librsjni.so
+++ b/renderscript/lib/packaged/x86/librsjni.so
Binary files differ
diff --git a/renderscript/lib/renderscript-v8.jar b/renderscript/lib/renderscript-v8.jar
index 47a085c..2775a13 100644
--- a/renderscript/lib/renderscript-v8.jar
+++ b/renderscript/lib/renderscript-v8.jar
Binary files differ
diff --git a/source.properties b/source.properties
index 4c5a442..cf225a8 100644
--- a/source.properties
+++ b/source.properties
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
-//Pkg.Revision=21.0.0
+//Pkg.Revision=22.1.1
 
 Archive.Os=MACOSX
 Pkg.Revision=22.0.0
diff --git a/zipalign b/zipalign
index 706ca4c..7466ba8 100755
--- a/zipalign
+++ b/zipalign
Binary files differ