Roll android_tools deps

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.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.omnibox;
 
 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ANIMATION_DURATION_MS;
 
 import android.Manifest;
 import android.animation.Animator;
@@ skipping 1193 matching lines @@
     public void updateSecurityIcon(int securityLevel) {
         if (mQueryInTheOmnibox) {
             if (securityLevel == ConnectionSecurityLevel.SECURE
                     || securityLevel == ConnectionSecurityLevel.EV_SECURE) {
                 securityLevel = ConnectionSecurityLevel.NONE;
             } else if (securityLevel == ConnectionSecurityLevel.SECURITY_WARNING
                     || securityLevel == ConnectionSecurityLevel.SECURITY_ERROR) {
                 setUrlToPageUrl();
             }
         }
-
+        int id = getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme());
         // ImageView#setImageResource is no-op if given resource is the current one.
-        mSecurityButton.setImageResource(
-                getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme()));
+        if (id == 0) {
+            mSecurityButton.setImageDrawable(null);
+        } else {
+            mSecurityButton.setImageResource(id);
+        }
 
         if (mSecurityIconType == securityLevel) return;
         mSecurityIconType = securityLevel;
 
         if (securityLevel == ConnectionSecurityLevel.NONE) {
             updateSecurityButton(false);
         } else {
             updateSecurityButton(true);
         }
         // Since we emphasize the schema of the URL based on the security type, we need to
@@ skipping 49 matching lines @@
                         getResources(), R.drawable.ic_omnibox_page);
                 page.setColorFilter(mUseDarkColors
                         ? ApiCompatibilityUtils.getColor(getResources(), R.color.light_normal_color)
                         : Color.WHITE, PorterDuff.Mode.SRC_IN);
                 mNavigationButton.setImageDrawable(page);
                 break;
             case MAGNIFIER:
                 mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier);
                 break;
             case EMPTY:
-                mNavigationButton.setImageResource(0);
+                mNavigationButton.setImageDrawable(null);
                 break;
             default:
                 assert false;
         }
 
         if (mNavigationButton.getVisibility() != VISIBLE) {
             mNavigationButton.setVisibility(VISIBLE);
         }
         mNavigationButtonType = buttonType;
         updateLocationBarIconContainerVisibility();
@@ skipping 1130 matching lines @@
     public View getContainerView() {
         return this;
     }
 
     @Override
     public void setTitleToPageTitle() { }
 
     @Override
     public void setShowTitle(boolean showTitle) { }
 }