[Android]Fix a regression that snackbar sits behind the scrim

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

Index: chrome/android/java/res/layout/main.xml
diff --git a/chrome/android/java/res/layout/main.xml b/chrome/android/java/res/layout/main.xml
index a894680a71ff3dc00a2be7b6da57b430af92a236..bd8c9a51ebc73dfbf38a06f44796f002bbf85f74 100644
--- a/chrome/android/java/res/layout/main.xml
+++ b/chrome/android/java/res/layout/main.xml
@@ -3,7 +3,8 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -13,7 +14,18 @@
             android:id="@+id/compositor_view_holder"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1" />
+            android:layout_weight="1" >
+
+            <ViewStub
+                android:id="@+id/omnibox_results_container_stub"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/tab_strip_height"
+                android:inflatedId="@+id/omnibox_results_container"
+                android:layout="@layout/omnibox_results_container"
+                app:layout_behavior="org.chromium.chrome.browser.compositor.CompositorViewHolderBehavior" />
+
+        </org.chromium.chrome.browser.compositor.CompositorViewHolder>
 
         <HorizontalScrollView
             android:id="@+id/keyboard_accessory"
@@ -32,14 +44,6 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <ViewStub
-        android:id="@+id/omnibox_results_container_stub"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/tab_strip_height"
-        android:inflatedId="@+id/omnibox_results_container"
-        android:layout="@layout/omnibox_results_container" />
-
     <!-- Toolbar size area painted black to avoid the action bar showing the window background -->
     <View
         android:id="@+id/action_bar_black_background"