Revert of Roll android_tools deps

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index ade5d12783b9c3c7908c5494bd1db32eac487d84..79d7d9d667a3722d5735f67922d166f46019357b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -1211,13 +1211,10 @@
                 setUrlToPageUrl();
             }
         }
-        int id = getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme());
+
         // ImageView#setImageResource is no-op if given resource is the current one.
-        if (id == 0) {
-            mSecurityButton.setImageDrawable(null);
-        } else {
-            mSecurityButton.setImageResource(id);
-        }
+        mSecurityButton.setImageResource(
+                getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme()));
 
         if (mSecurityIconType == securityLevel) return;
         mSecurityIconType = securityLevel;
@@ -1287,7 +1284,7 @@
                 mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier);
                 break;
             case EMPTY:
-                mNavigationButton.setImageDrawable(null);
+                mNavigationButton.setImageResource(0);
                 break;
             default:
                 assert false;