diff --git a/.buckconfig b/.buckconfig
index 934256cb2..9f6c686b2 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -4,3 +4,6 @@
 
 [maven_repositories]
   central = https://repo1.maven.org/maven2
+
+[alias]
+  movies = //Examples/Movies/android/app:app
diff --git a/.gitignore b/.gitignore
index fe61f843f..cd545b912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,8 @@ project.xcworkspace
 # Buck
 .buckd
 buck-out
+/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/
+/ReactAndroid/src/main/jni/prebuilt/lib/x86/
 
 # Android
 .idea
diff --git a/Examples/Movies/android/app/BUCK b/Examples/Movies/android/app/BUCK
new file mode 100644
index 000000000..25c73fd54
--- /dev/null
+++ b/Examples/Movies/android/app/BUCK
@@ -0,0 +1,43 @@
+include_defs('//ReactAndroid/DEFS')
+
+android_binary(
+  name = 'app',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//keystores:debug',
+  deps = [
+    ':movies-lib',
+  ],
+)
+
+android_library(
+  name = 'movies-lib',
+  srcs = glob(['src/main/java/**/*.java']),
+  deps = [
+    react_native_target('java/com/facebook/csslayout:csslayout'),
+    react_native_target('java/com/facebook/react:react'),
+    react_native_target('java/com/facebook/react/devsupport:devsupport'),
+    react_native_target('java/com/facebook/react/modules/core:core'),
+    react_native_target('java/com/facebook/react/shell:shell'),
+    react_native_target('java/com/facebook/react/touch:touch'),
+    react_native_target('java/com/facebook/react/uimanager:uimanager'),
+    react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
+    react_native_target('java/com/facebook/react/views/image:image'),
+    react_native_target('java/com/facebook/react/views/recyclerview:recyclerview'),
+    react_native_target('java/com/facebook/react/views/scroll:scroll'),
+    react_native_target('java/com/facebook/react/views/text:text'),
+    react_native_target('java/com/facebook/react/views/view:view'),
+    # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
+    react_native_target('jni/prebuilt:reactnative-libs'),
+    react_native_target('jni/prebuilt:android-jsc'),
+    react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
+    ':res',
+  ],
+)
+
+
+android_resource(
+  name = 'res',
+  res = 'src/main/res',
+  package = 'com.facebook.react.movies',
+)
diff --git a/Examples/Movies/android/app/src/main/AndroidManifest.xml b/Examples/Movies/android/app/src/main/AndroidManifest.xml
index 185ffa506..8aaec6081 100644
--- a/Examples/Movies/android/app/src/main/AndroidManifest.xml
+++ b/Examples/Movies/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
       android:allowBackup="true"
diff --git a/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml b/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml
index abb275d70..968a554cf 100644
--- a/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml
+++ b/Examples/UIExplorer/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
   <application
       android:allowBackup="true"
diff --git a/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java b/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java
index f4867da6b..f9a50e93f 100644
--- a/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java
+++ b/Examples/UIExplorer/android/app/src/main/java/UIExplorerActivity.java
@@ -17,10 +17,10 @@ package com.facebook.react.uiapp;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.uiapp.R;
 
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 public class UIExplorerActivity extends ReactActivity {
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 913dcbb73..e6fc06a58 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -204,6 +204,11 @@ task packageReactNdkLibs(dependsOn: buildReactNdkLib, type: Copy) {
     into "$buildDir/react-ndk/exported"
 }
 
+task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
+  from "$buildDir/react-ndk/exported"
+  into "src/main/jni/prebuilt/lib"
+}
+
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.1"
diff --git a/ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/BUCK
index d0aaa9598..8dd771536 100644
--- a/ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/BUCK
+++ b/ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/BUCK
@@ -1,30 +1,10 @@
-# Unpack resources from the appcompat aar and merge their ids into the
-# generated com.facebook.react.R class.
-#
-# We do this for compatibility with Gradle: we build the open source
-# version React Native with both Buck and Gradle. See for example
-# ReactToolbarManager.java where we access the appcompat resources
-# via com.facebook.react.R.
+include_defs('//ReactAndroid/DEFS')
+
+# used by ReactToolbarManager because of Gradle
+# TODO t10182713 will be replaced with res-for-appcompat when we stop using Gradle
 android_resource(
-    name = 'res-for-react-native',
-    res = ':res-unpacker-cmd',
-    package = 'com.facebook.react',
-    visibility = ['//ReactAndroid/...',],
-)
-
-genrule(
-    name = 'res-unpacker-cmd',
-    cmd = '$(exe :res-unpacker) $(location :appcompat-binary-aar) $OUT',
-    out = 'res',
-)
-
-python_binary(
-    name = 'res-unpacker',
-    main = 'res-unpacker.py',
-)
-
-remote_file(
-    name = 'appcompat-binary-aar',
-    url = 'mvn:com.android.support:appcompat-v7:aar:23.0.1',
-    sha1 = '7d659f671541394a8bc2b9f909950aa2a5ec87ff',
+  name = 'res-for-react-native',
+  res = react_native_dep('third-party/android/support/v7/appcompat-orig:res-unpacker-cmd'),
+  package = 'com.facebook.react',
+  visibility = ['//ReactAndroid/...',],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
index 770afb9c9..f7ff35e9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
@@ -9,7 +9,6 @@ android_library(
     react_native_target('java/com/facebook/csslayout:csslayout'),
     react_native_target('java/com/facebook/react/uimanager:uimanager'),
     react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
-    react_native_dep('android_res/android/support/v7/appcompat-orig:res-for-react-native'),
     react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
   ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
index 49a9a4b39..8b9224291 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
@@ -1,4 +1,11 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
 
 package com.facebook.react.views.toolbar;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
index aae498379..92c585d71 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
@@ -1,4 +1,11 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
 
 package com.facebook.react.views.toolbar;
 
diff --git a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
index cf2210851..93661768e 100644
--- a/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
+++ b/ReactAndroid/src/main/libraries/fbcore/src/main/java/com/facebook/common/logging/BUCK
@@ -1,11 +1,10 @@
-android_prebuilt_aar(
+include_defs('//ReactAndroid/DEFS')
+
+android_library(
     name = 'logging',
-    aar = ':fbcore-binary-aar',
-    visibility = ['//ReactAndroid/...'],
+    exported_deps = [
+        react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
+    ],
+    visibility = ['//ReactAndroid/...',],
 )
 
-remote_file(
-    name = 'fbcore-binary-aar',
-    url = 'mvn:com.facebook.fresco:fbcore:aar:0.8.1',
-    sha1 = 'cc46b3d564139bf63bb41534c7a723ee8119ae5f',
-)
diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK
index b0a85e26b..3f34e9424 100644
--- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK
@@ -1,7 +1,7 @@
 android_prebuilt_aar(
     name = 'lib-support-v4',
     aar = ':lib-support-v4-binary-aar',
-    visibility = ['//ReactAndroid/...',],
+    visibility = ['PUBLIC',],
 )
 
 remote_file(
diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
index c0164418b..9afb2e02f 100644
--- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
+++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK
@@ -1,9 +1,59 @@
-android_prebuilt_aar(
-    name = 'appcompat-23.1',
-    aar = ':appcompat-binary-aar',
+include_defs('//ReactAndroid/DEFS')
+
+# This is a bit messy and hopefully a temporary thing
+# The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react
+# While BUCK behaves properly and extracts them into android.support.v7.appcompat package.
+# We want to support both Gradle and BUCK builds so we hack a bit how BUCK extracts resources.
+# Besides that we still need JAVA classes from appcompat-v7.aar, that is why android_library
+# extracts classes.jar but the trick is that we can't take full appcompat.aar because resources
+# extracted from it by BUCK would conflict with resources we use under Gradelified package
+# All this mumbo jumbo will go away after t10182713
+
+android_library(
+  name = 'appcompat',
+  deps = [
+    ':res-for-appcompat',
+  ],
+  visibility = [
+    'PUBLIC',
+  ],
+  exported_deps = [
+    ':classes-for-react-native',
+  ],
+)
+
+# still used by appcompat library internally, so we need both during the build
+android_resource(
+  name = 'res-for-appcompat',
+  res = ':res-unpacker-cmd',
+  package = 'android.support.v7.appcompat',
+  visibility = ['//ReactAndroid/...',],
+)
+
+prebuilt_jar(
+    name = 'classes-for-react-native',
+    binary_jar = ':classes-unpacker-cmd',
     visibility = ['//ReactAndroid/...',],
 )
 
+genrule(
+    name = 'classes-unpacker-cmd',
+    cmd = '$(exe :aar-unpacker) $(location :appcompat-binary-aar) "classes.jar" $OUT',
+    out = 'classes.jar',
+)
+
+genrule(
+    name = 'res-unpacker-cmd',
+    cmd = '$(exe :aar-unpacker) $(location :appcompat-binary-aar) "res/" $OUT',
+    out = 'res',
+    visibility = ['//ReactAndroid/...',],
+)
+
+python_binary(
+    name = 'aar-unpacker',
+    main = 'aar-unpacker.py',
+)
+
 remote_file(
     name = 'appcompat-binary-aar',
     url = 'mvn:com.android.support:appcompat-v7:aar:23.0.1',
diff --git a/ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/res-unpacker.py b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/aar-unpacker.py
similarity index 70%
rename from ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/res-unpacker.py
rename to ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/aar-unpacker.py
index 145d09b02..ddb65efb2 100644
--- a/ReactAndroid/src/main/android_res/android/support/v7/appcompat-orig/res-unpacker.py
+++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/aar-unpacker.py
@@ -5,7 +5,7 @@ import sys
 import tempfile
 import zipfile
 
-# Helper that unpacks the contents of the res folder of an .aar file
+# Helper that unpacks the contents of an .aar file
 # into given destination.
 
 @contextlib.contextmanager
@@ -16,5 +16,5 @@ def cleanup(path):
 if __name__ == '__main__':
     with zipfile.ZipFile(sys.argv[1], 'r') as z:
         with cleanup(tempfile.mkdtemp()) as temp_path:
-            z.extractall(temp_path, filter(lambda n: n.startswith('res/'), z.namelist()))
-            shutil.move(os.path.join(temp_path, 'res'), sys.argv[2])
+            z.extractall(temp_path, filter(lambda n: n.startswith(sys.argv[2]), z.namelist()))
+            shutil.move(os.path.join(temp_path, sys.argv[2]), sys.argv[3])
diff --git a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
index 3b5bb0b0e..0c02a2716 100644
--- a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
+++ b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
@@ -1,7 +1,7 @@
 prebuilt_jar(
     name = 'jsr-305',
     binary_jar = ':jsr305-binary-jar',
-    visibility = ['//ReactAndroid/...',],
+    visibility = ['PUBLIC'],
 )
 
 remote_file(
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9881fc8cf..0c42144e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-2.11-all.zip
diff --git a/keystores/BUCK b/keystores/BUCK
new file mode 100644
index 000000000..15da20e6b
--- /dev/null
+++ b/keystores/BUCK
@@ -0,0 +1,8 @@
+keystore(
+  name = 'debug',
+  store = 'debug.keystore',
+  properties = 'debug.keystore.properties',
+  visibility = [
+    'PUBLIC',
+  ],
+)
diff --git a/keystores/debug.keystore b/keystores/debug.keystore
new file mode 100644
index 000000000..364e105ed
Binary files /dev/null and b/keystores/debug.keystore differ
diff --git a/keystores/debug.keystore.properties b/keystores/debug.keystore.properties
new file mode 100644
index 000000000..121bfb49f
--- /dev/null
+++ b/keystores/debug.keystore.properties
@@ -0,0 +1,4 @@
+key.store=debug.keystore
+key.alias=androiddebugkey
+key.store.password=android
+key.alias.password=android