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

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

Index: chrome/android/java/res/layout/eb_edit.xml
diff --git a/chrome/android/java/res/layout/eb_edit.xml b/chrome/android/java/res/layout/eb_edit.xml
index a8254096fdac7d8f7b5a9018b19a15208f9ac2c3..5665c6508bd426f5ffeb2764be8802281e985122 100644
--- a/chrome/android/java/res/layout/eb_edit.xml
+++ b/chrome/android/java/res/layout/eb_edit.xml
@@ -31,12 +31,14 @@
             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"
@@ -53,27 +55,26 @@
             <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"