Update baseline for AGP 3.0.0-dev

Test: ./gradlew lintRelease using latest AGP
Change-Id: I194e4339d26b4fac4746bd10ee4ceeaf26ef5870
diff --git a/core-ui/lint-baseline-custom.xml b/core-ui/lint-baseline-custom.xml
index 6f3077e..a52bb63 100644
--- a/core-ui/lint-baseline-custom.xml
+++ b/core-ui/lint-baseline-custom.xml
@@ -74,7 +74,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/design/lint-baseline-custom.xml b/design/lint-baseline-custom.xml
index c710025..26b9514 100644
--- a/design/lint-baseline-custom.xml
+++ b/design/lint-baseline-custom.xml
@@ -467,7 +467,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -478,7 +478,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -489,7 +489,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/emoji/appcompat/lint-baseline-custom.xml b/emoji/appcompat/lint-baseline-custom.xml
index 48f41bc..d4f98c8 100644
--- a/emoji/appcompat/lint-baseline-custom.xml
+++ b/emoji/appcompat/lint-baseline-custom.xml
@@ -353,7 +353,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -364,7 +364,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -375,7 +375,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/fragment/lint-baseline-custom.xml b/fragment/lint-baseline-custom.xml
index bcfa6d3..26e1071 100644
--- a/fragment/lint-baseline-custom.xml
+++ b/fragment/lint-baseline-custom.xml
@@ -15,6 +15,17 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="536"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
         errorLine2="                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -26,6 +37,28 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="538"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="586"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -48,6 +81,17 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="589"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
@@ -63,6 +107,28 @@
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="608"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="611"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
             line="611"
             column="75"/>
     </issue>
@@ -140,7 +206,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -151,7 +217,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -162,7 +228,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/graphics/drawable/animated/lint-baseline-custom.xml b/graphics/drawable/animated/lint-baseline-custom.xml
index 490f799..7263b78 100644
--- a/graphics/drawable/animated/lint-baseline-custom.xml
+++ b/graphics/drawable/animated/lint-baseline-custom.xml
@@ -37,6 +37,28 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="536"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="538"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
         errorLine2="                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -63,6 +85,28 @@
         errorLine2="                                                                              ~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="586"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="589"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
             line="589"
             column="79"/>
     </issue>
@@ -85,6 +129,28 @@
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="608"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="611"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
             line="611"
             column="75"/>
     </issue>
@@ -96,7 +162,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -107,7 +173,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -118,7 +184,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/recommendation/lint-baseline-custom.xml b/recommendation/lint-baseline-custom.xml
index bcfa6d3..d2a19f4 100644
--- a/recommendation/lint-baseline-custom.xml
+++ b/recommendation/lint-baseline-custom.xml
@@ -140,7 +140,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/transition/lint-baseline-custom.xml b/transition/lint-baseline-custom.xml
index bcfa6d3..26e1071 100644
--- a/transition/lint-baseline-custom.xml
+++ b/transition/lint-baseline-custom.xml
@@ -15,6 +15,17 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="536"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
         errorLine2="                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -26,6 +37,28 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="538"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="586"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -48,6 +81,17 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="589"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
@@ -63,6 +107,28 @@
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="608"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="611"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
             line="611"
             column="75"/>
     </issue>
@@ -140,7 +206,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -151,7 +217,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -162,7 +228,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v13/lint-baseline-custom.xml b/v13/lint-baseline-custom.xml
index bcfa6d3..26e1071 100644
--- a/v13/lint-baseline-custom.xml
+++ b/v13/lint-baseline-custom.xml
@@ -15,6 +15,17 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="536"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
         errorLine2="                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -26,6 +37,28 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="538"
+            column="63"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="586"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~">
         <location
@@ -48,6 +81,17 @@
     <issue
         id="Range"
         message="Value must be ≥ 0 (was -1)"
+        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="589"
+            column="79"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
         errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
@@ -63,6 +107,28 @@
         errorLine2="                                                                          ~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="608"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
+            line="611"
+            column="75"/>
+    </issue>
+
+    <issue
+        id="Range"
+        message="Value must be ≥ 0 (was -1)"
+        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
+        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
+        <location
+            file="java/android/support/v4/widget/SlidingPaneLayout.java"
             line="611"
             column="75"/>
     </issue>
@@ -140,7 +206,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -151,7 +217,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -162,7 +228,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v14/preference/lint-baseline-custom.xml b/v14/preference/lint-baseline-custom.xml
index 19ff432..64d022b 100644
--- a/v14/preference/lint-baseline-custom.xml
+++ b/v14/preference/lint-baseline-custom.xml
@@ -522,7 +522,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -533,7 +533,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -544,7 +544,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v17/leanback/lint-baseline-custom.xml b/v17/leanback/lint-baseline-custom.xml
index 1b2fe3b..8feacb3 100644
--- a/v17/leanback/lint-baseline-custom.xml
+++ b/v17/leanback/lint-baseline-custom.xml
@@ -573,7 +573,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -584,7 +584,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -595,7 +595,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
@@ -617,7 +617,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/android/support/v17/leanback/widget/GridLayoutManager.java"
-            line="3468"
+            line="3476"
             column="45"/>
     </issue>
 
diff --git a/v17/preference-leanback/lint-baseline-custom.xml b/v17/preference-leanback/lint-baseline-custom.xml
index 347fb33..fc2312b 100644
--- a/v17/preference-leanback/lint-baseline-custom.xml
+++ b/v17/preference-leanback/lint-baseline-custom.xml
@@ -885,7 +885,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -896,7 +896,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -907,7 +907,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
@@ -929,7 +929,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/android/support/v17/leanback/widget/GridLayoutManager.java"
-            line="3468"
+            line="3476"
             column="45"/>
     </issue>
 
diff --git a/v4/lint-baseline-custom.xml b/v4/lint-baseline-custom.xml
index bcfa6d3..d2a19f4 100644
--- a/v4/lint-baseline-custom.xml
+++ b/v4/lint-baseline-custom.xml
@@ -140,7 +140,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -162,7 +162,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v7/appcompat/lint-baseline-custom.xml b/v7/appcompat/lint-baseline-custom.xml
index 48f41bc..d4f98c8 100644
--- a/v7/appcompat/lint-baseline-custom.xml
+++ b/v7/appcompat/lint-baseline-custom.xml
@@ -353,7 +353,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -364,7 +364,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -375,7 +375,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v7/gridlayout/lint-baseline-custom.xml b/v7/gridlayout/lint-baseline-custom.xml
index 6f3077e..a52bb63 100644
--- a/v7/gridlayout/lint-baseline-custom.xml
+++ b/v7/gridlayout/lint-baseline-custom.xml
@@ -74,7 +74,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -96,7 +96,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v7/mediarouter/lint-baseline-custom.xml b/v7/mediarouter/lint-baseline-custom.xml
index 286a151..6401f93 100644
--- a/v7/mediarouter/lint-baseline-custom.xml
+++ b/v7/mediarouter/lint-baseline-custom.xml
@@ -375,7 +375,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -386,7 +386,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -397,7 +397,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v7/preference/lint-baseline-custom.xml b/v7/preference/lint-baseline-custom.xml
index ccfaffc..1758dc4 100644
--- a/v7/preference/lint-baseline-custom.xml
+++ b/v7/preference/lint-baseline-custom.xml
@@ -489,7 +489,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -500,7 +500,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -511,7 +511,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/v7/recyclerview/lint-baseline-custom.xml b/v7/recyclerview/lint-baseline-custom.xml
index 831d40f..d177378 100644
--- a/v7/recyclerview/lint-baseline-custom.xml
+++ b/v7/recyclerview/lint-baseline-custom.xml
@@ -188,7 +188,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -199,7 +199,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -210,7 +210,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>
 
diff --git a/wear/lint-baseline-custom.xml b/wear/lint-baseline-custom.xml
index 3b59912..0fd7351 100644
--- a/wear/lint-baseline-custom.xml
+++ b/wear/lint-baseline-custom.xml
@@ -214,7 +214,7 @@
         errorLine2="                                    ~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
+            line="634"
             column="37"/>
     </issue>
 
@@ -225,7 +225,7 @@
         errorLine2="                                 ~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
+            line="707"
             column="34"/>
     </issue>
 
@@ -236,7 +236,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
+            line="1067"
             column="25"/>
     </issue>