diff --git a/.travis.yml b/.travis.yml
index e33a84b270..3dc9cc413b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ jdk:
     - oraclejdk8
 android:
   components:
-    - platform-tools
     - tools
     - build-tools-24.0.0
     - android-24
+    - platform-tools
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
index f777db4abb..e21f110bba 100644
--- a/admob/app/build.gradle
+++ b/admob/app/build.gradle
@@ -21,10 +21,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     packagingOptions {
         exclude 'LICENSE.txt'
     }
diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
index 13775ceaf4..4fae803fe2 100644
--- a/analytics/app/build.gradle
+++ b/analytics/app/build.gradle
@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     buildTypes {
         release {
             minifyEnabled true
diff --git a/analytics/app/src/main/res/values-v21/styles.xml b/analytics/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000000..33bf15f817
--- /dev/null
+++ b/analytics/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,24 @@
+<!--
+Copyright 2015 Google Inc. All rights reserved.
+
+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.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/analytics/app/src/main/res/values/styles.xml b/analytics/app/src/main/res/values/styles.xml
index 33bf15f817..6e72511135 100644
--- a/analytics/app/src/main/res/values/styles.xml
+++ b/analytics/app/src/main/res/values/styles.xml
@@ -18,7 +18,6 @@ specific language governing permissions and limitations under the License.
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 
 </resources>
diff --git a/app-indexing/app/build.gradle b/app-indexing/app/build.gradle
index 6c3a3de52d..6c4ba35d45 100644
--- a/app-indexing/app/build.gradle
+++ b/app-indexing/app/build.gradle
@@ -13,17 +13,12 @@ android {
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    lintOptions {
-        abortOnError false
-    }
 }
 
 dependencies {
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
index 3ba0a52ce3..8b27632bf0 100644
--- a/auth/app/build.gradle
+++ b/auth/app/build.gradle
@@ -19,10 +19,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     productFlavors {
 
         // Build variant to include the Facebook Android SDk
diff --git a/auth/app/src/facebook/AndroidManifest.xml b/auth/app/src/facebook/AndroidManifest.xml
new file mode 100644
index 0000000000..12d4203fd4
--- /dev/null
+++ b/auth/app/src/facebook/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.firebase.quickstart.auth">
+
+    <application>
+        <!-- Facebook Configuration -->
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_app_id" />
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+    </application>
+</manifest>
diff --git a/auth/app/src/main/res/layout/activity_facebook.xml b/auth/app/src/facebook/res/layout/activity_facebook.xml
similarity index 100%
rename from auth/app/src/main/res/layout/activity_facebook.xml
rename to auth/app/src/facebook/res/layout/activity_facebook.xml
diff --git a/auth/app/src/main/AndroidManifest.xml b/auth/app/src/main/AndroidManifest.xml
index 5aaf4b3061..1e6420c938 100644
--- a/auth/app/src/main/AndroidManifest.xml
+++ b/auth/app/src/main/AndroidManifest.xml
@@ -27,17 +27,6 @@
         <activity
             android:name=".FacebookLoginActivity"
             android:label="@string/label_facebook_login" />
-
-        <!-- Facebook Configuration -->
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id" />
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
         <activity
             android:name=".EmailPasswordActivity"
             android:label="@string/label_emailpassword"
diff --git a/config/app/build.gradle b/config/app/build.gradle
index a0648ff4e0..34a1ed6b64 100644
--- a/config/app/build.gradle
+++ b/config/app/build.gradle
@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     buildTypes {
         release {
             minifyEnabled true
diff --git a/crash/app/build.gradle b/crash/app/build.gradle
index 12ea113979..0453b55aa3 100644
--- a/crash/app/build.gradle
+++ b/crash/app/build.gradle
@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     buildTypes {
         release {
             minifyEnabled true
diff --git a/database/app/build.gradle b/database/app/build.gradle
index 8c05485962..d062b7b1e3 100644
--- a/database/app/build.gradle
+++ b/database/app/build.gradle
@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     buildTypes {
         release {
             minifyEnabled true
diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle
index 6a0bfcdbd0..49ce2884d4 100644
--- a/dynamiclinks/app/build.gradle
+++ b/dynamiclinks/app/build.gradle
@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     buildTypes {
         release {
             minifyEnabled true
diff --git a/invites/app/build.gradle b/invites/app/build.gradle
index e7e8bb5a1d..bd4ba5902e 100644
--- a/invites/app/build.gradle
+++ b/invites/app/build.gradle
@@ -21,10 +21,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     packagingOptions {
         exclude 'LICENSE.txt'
     }
diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
index a62e1d6156..8d4ab30ee0 100644
--- a/messaging/app/build.gradle
+++ b/messaging/app/build.gradle
@@ -21,10 +21,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     packagingOptions {
         exclude 'LICENSE.txt'
     }
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
index 288597972c..73942a303f 100644
--- a/storage/app/build.gradle
+++ b/storage/app/build.gradle
@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     buildTypes {
         release {
             minifyEnabled true