Add support for images with descriptions to infobars

chrome/android/java/res/layout/infobar_control_toggle.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="36dp"
     android:gravity="center_vertical">
 
     <ImageView
-        android:id="@+id/control_toggle_icon"
+        android:id="@+id/control_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/infobar_control_margin_between_items"
         android:scaleType="centerInside"
         android:contentDescription="@null" />
 
-    <!-- TODO(dfalcantara): Line spacing multiplier is applied to all lines in JB & KK, even if the
-                            TextView has only one line.  This throws off vertical alignment.  Find
-                            a solution that hopefully doesn't involve subclassing the TextView.
-    -->
     <TextView
-        android:id="@+id/control_toggle_message"
+        android:id="@+id/control_message"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:layout_marginEnd="@dimen/infobar_control_margin_between_items"
         android:gravity="center_vertical"
         android:textSize="@dimen/infobar_text_size"
         android:textColor="@color/default_text_color" />
 
     <android.support.v7.widget.SwitchCompat
         android:id="@+id/control_toggle_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
 </LinearLayout>