Update to newer Android Lint and suppress new Lint errors

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 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;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.test.mock.MockResources;
 import android.util.DisplayMetrics;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
@@ skipping 92 matching lines @@
         return mBooleans.get(id);
     }
 
     @Override
     public String getString(int id) {
         final String value = mStrings.get(id);
         return value != null ? value.toString() : mValidResources.getString(id);
     }
 
     @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);
     }
 
     @Override
     public Drawable getDrawable(int id) {
         return mDrawable;
     }
 
     @Override
     public Drawable getDrawable(int id, Resources.Theme theme) {
         return mDrawable;
     }
 }