Remove non-elderberry herb flavors.

chrome/android/java/res/layout/toolbar.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. -->
 
 <!-- The toolbar containing the URL bar, back button, and NTP button.
 -->
 
 <org.chromium.chrome.browser.toolbar.ToolbarPhone
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/toolbar_height_no_shadow" >
 
     <org.chromium.chrome.browser.widget.newtab.NewTabButton
         android:id="@+id/new_tab_button"
         style="@style/ToolbarButton"
         android:layout_width="wrap_content"
         android:layout_gravity="start|top"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:visibility="invisible"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/accessibility_toolbar_btn_new_tab" />
 
-    <org.chromium.chrome.browser.widget.TintedImageButton
-        android:id="@+id/return_button"
-        style="@style/ToolbarButton"
-        android:src="@drawable/btn_close"
-        android:contentDescription="@string/close_tab_and_return"
-        android:visibility="gone" />
-
     <org.chromium.chrome.browser.toolbar.HomePageButton
         android:id="@+id/home_button"
         style="@style/ToolbarButton"
         android:src="@drawable/btn_toolbar_home"
         android:contentDescription="@string/accessibility_toolbar_btn_home"
         android:visibility="gone" />
 
     <org.chromium.chrome.browser.omnibox.LocationBarPhone
         android:id="@+id/location_bar"
         android:layout_width="match_parent"
@@ skipping 37 matching lines @@
     </LinearLayout>
 
     <org.chromium.chrome.browser.widget.ToolbarProgressBar
         android:id="@+id/progress"
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_progress_bar_height"
         chrome:progressBarColor="@color/progress_bar_foreground"
         chrome:backgroundColor="@color/progress_bar_background" />
 
 </org.chromium.chrome.browser.toolbar.ToolbarPhone>