Revert "Fix Layout for WebViewTest"

This reverts commit 7c57475340a1f1a90fd50bc5299626bfdf435e93.

The commit that this reverts was masking the real failure which was
introduced in the WebKit merge to r74534. See buganizer for all the
gritty details.

Bug: 5572431
Change-Id: I1dd57652c1bd8a27bcce2442b21f1355c55b38c7
diff --git a/tests/res/layout/webview_layout.xml b/tests/res/layout/webview_layout.xml
index d266d21..7a0ed0d 100644
--- a/tests/res/layout/webview_layout.xml
+++ b/tests/res/layout/webview_layout.xml
@@ -17,9 +17,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <WebView android:id="@+id/web_page"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </LinearLayout>