Inflate toolbar layouts in ControlContainer

chrome/android/java/res/layout/custom_tabs_control_container.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. -->
 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/control_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/custom_tabs_control_container_height" >
     <view
         class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
         android:id="@+id/toolbar_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <include
-            android:id="@+id/toolbar"
+        <ViewStub
+            android:id="@+id/toolbar_stub"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/custom_tabs_control_container_height"
-            layout="@layout/custom_tabs_toolbar" />
+            android:layout_height="@dimen/custom_tabs_control_container_height" />
         <ImageView
             android:id="@+id/toolbar_shadow"
             android:src="@drawable/toolbar_shadow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/custom_tabs_control_container_height"
             android:scaleType="fitXY"
             android:contentDescription="@null" />
         <ViewStub
             android:id="@+id/find_toolbar_stub"
             android:inflatedId="@+id/find_toolbar"
             android:visibility="gone"
             android:layout_marginTop="@dimen/tab_strip_height"
             android:layout_width="match_parent"
             android:layout_height="@dimen/custom_tabs_control_container_height"
             android:layout="@layout/find_toolbar" />
         <ViewStub
             android:id="@+id/find_toolbar_tablet_stub"
             android:inflatedId="@+id/find_toolbar"
             android:layout_width="@dimen/find_in_page_popup_width"
             android:layout_height="@dimen/find_in_page_popup_height"
             android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"
             android:layout_gravity="end|top"
             android:layout="@layout/find_toolbar" />
     </view>
 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>