Revert of Use only toolbar to transition from fakebox to real omnibox.

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

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 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.ntp.NewTabPageLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
     android:id="@+id/ntp_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ skipping 14 matching lines @@
         android:visibility="invisible" />
 
     <!-- Search provider logo -->
     <org.chromium.chrome.browser.ntp.LogoView
         android:id="@+id/search_provider_logo"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/ntp_logo_height"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginTop="26dp"
-        android:layout_marginBottom="23dp" />
+        android:layout_marginBottom="27dp" />
 
     <!-- Search box -->
     <LinearLayout
         android:id="@+id/search_box"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
-        android:layout_marginTop="7dp"
+        android:layout_marginTop="3dp"
         android:layout_marginBottom="8dp"
         android:gravity="center_vertical"
         android:background="@drawable/bg_ntp_search_box"
         android:orientation="horizontal" >
         <EditText
             android:id="@+id/search_box_text"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="12dp"
             android:layout_weight="1"
@@ skipping 60 matching lines @@
         android:layout_weight="1"
         android:visibility="gone" />
 
     <!--  Scroll spacer -->
     <View
         android:id="@+id/ntp_scroll_spacer"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:visibility="gone" />
 </org.chromium.chrome.browser.ntp.NewTabPageLayout>