Update to newer Android Lint and suppress new Lint errors

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockResourcesForLayout.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockResourcesForLayout.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockResourcesForLayout.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockResourcesForLayout.java
index 8c96659eafa521295ca9f3f82cecab11ed2900e5..35ba1dcd5a453228d9a836b67d53a69939e802b3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockResourcesForLayout.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockResourcesForLayout.java
@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.compositor.layouts;
 
+import android.annotation.SuppressLint;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -116,11 +117,15 @@ public class MockResourcesForLayout extends MockResources {
     }
 
     @Override
+    // TODO(crbug.com/635567): Fix this properly.
+    @SuppressLint("ResourceType")
     public int getColor(int id) {
         return getInteger(id);
     }
 
     @Override
+    // TODO(crbug.com/635567): Fix this properly.
+    @SuppressLint("ResourceType")
     public int getColor(int id, Theme theme) {
         return getInteger(id);
     }