diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index c06fd159bbdad9a64b124c27d4832cd50fd514e3..bf6d0593b1a2fb9422e64c41da0d6c6ebbeb2e3e 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -89,8 +89,6 @@ android {
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 
-        ndkVersion "21.3.6528147"
-
         multiDexEnabled true
         multiDexKeepProguard file('multidex-keep.pro')
 
@@ -115,10 +113,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     lintOptions {
         disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag'
     }
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 5543e0d1960b0ad14ded0e70a1f97f6b9304c8c9..37e173875ee5c659869a578534402579b86bfaea 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -114,7 +114,6 @@
         android:fullBackupOnly="true"
         android:extractNativeLibs="false"
         android:forceQueryable="true"
-        android:persistent="true"
         android:icon="@mipmap/ic_core_service_app"
         android:label="@string/gms_app_name"
         android:theme="@style/Theme.AppCompat.DayNight">
@@ -702,13 +701,13 @@
 
         <service android:name="org.microg.gms.appinvite.AppInviteService">
             <intent-filter>
-                <action android:name="com.google.android.gms.appinvite.service.START"/>
+                <action android:name="com.google.android.gms.appinvite.service.START" />
             </intent-filter>
         </service>
 
         <service android:name="org.microg.gms.firebase.dynamiclinks.DynamicLinksService">
             <intent-filter>
-                <action android:name="com.google.firebase.dynamiclinks.service.START"/>
+                <action android:name="com.google.firebase.dynamiclinks.service.START" />
             </intent-filter>
         </service>