Revert of [Android] Make enhanced bookmark editing UI more straightforward.

chrome/android/java/res/layout/eb_edit.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"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ skipping 13 matching lines @@
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:orientation="vertical" >
 
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="22dp" >
+                android:layout_height="wrap_content" >
+
                 <!-- android:text is set here is to avoid UI jumping. -->
                 <org.chromium.chrome.browser.widget.EmptyAlertEditText
                     android:id="@+id/title_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/bookmark_name"
                     android:text="@string/bookmark_name"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textCapSentences|textAutoCorrect"
                     android:singleLine="true"
                     chrome:alertMessage="@string/bookmark_missing_title" />
             </android.support.design.widget.TextInputLayout>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="3dp"
-                android:layout_marginEnd="3dp"
+                android:paddingEnd="3dp"
+                android:paddingStart="3dp"
+                android:paddingTop="8dp"
                 android:text="@string/bookmark_folder"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
             <TextView
                 android:id="@+id/folder_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
-                android:layout_marginStart="3dp"
-                android:layout_marginEnd="3dp"
+                android:paddingBottom="8dp"
+                android:paddingEnd="3dp"
+                android:paddingStart="3dp"
+                android:paddingTop="8dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="@color/dark_mode_tint" />
 
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp" >
+                android:layout_height="wrap_content" >
 
                 <org.chromium.chrome.browser.widget.EmptyAlertEditText
                     android:id="@+id/url_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/bookmark_url"
                     android:text="@string/bookmark_url"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textUri"
                     android:singleLine="true"
                     chrome:alertMessage="@string/bookmark_missing_url" />
             </android.support.design.widget.TextInputLayout>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>