diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index e53ede2..7012ded 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -45,7 +45,7 @@
     </style>
 
     <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription">
-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item>
     </style>
 
     <style name="SuwRadioButton">
@@ -54,7 +54,7 @@
         <item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/suw_radio_button_margin_start</item>
         <item name="android:layout_marginTop">@dimen/suw_radio_button_margin_top</item>
         <item name="android:lineSpacingExtra">@dimen/suw_radio_button_line_spacing_extra</item>
-        <item name="android:paddingLeft" tools:ignore="NewApi">@dimen/suw_radio_button_padding_start</item>
+        <item name="android:paddingLeft">@dimen/suw_radio_button_padding_start</item>
         <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_radio_button_padding_start</item>
         <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item>
     </style>
diff --git a/library/main/src/com/android/setupwizardlib/view/Illustration.java b/library/main/src/com/android/setupwizardlib/view/Illustration.java
index 537ddc7..f3a9598 100644
--- a/library/main/src/com/android/setupwizardlib/view/Illustration.java
+++ b/library/main/src/com/android/setupwizardlib/view/Illustration.java
@@ -141,6 +141,7 @@ public class Illustration extends FrameLayout {
             setPadding(0, illustrationHeight, 0, 0);
         }
         if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+            //noinspection AndroidLintInlinedApi
             setOutlineProvider(ViewOutlineProvider.BOUNDS);
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -211,6 +212,7 @@ public class Illustration extends FrameLayout {
                 return drawable.isAutoMirrored();
             } else if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
                 final int flags = getContext().getApplicationInfo().flags;
+                //noinspection AndroidLintInlinedApi
                 return (flags & ApplicationInfo.FLAG_SUPPORTS_RTL) != 0;
             }
         }
diff --git a/library/self.gradle b/library/self.gradle
index e809b51..b41b696 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -9,8 +9,17 @@ apply from: '../tools/gradle/docs.gradle'
 
 task docs(dependsOn: 'javadocPlatformRelease')
 
+android.lintOptions {
+    abortOnError true
+}
+
+// Run lint for all variants
+android.libraryVariants.all { variant ->
+    variant.assemble.dependsOn(tasks.findByName('lint'))
+}
+
 // Output all test APKs to the distribution folder
-def distTask = tasks.findByName('dist');
+def distTask = tasks.findByName('dist')
 if (distTask) {
     android.testVariants.all { variant ->
         // Make the dist task depend on the test variant, so the test APK will be built