Make //blimp/client/app a real embedder of //blimp/client/public

blimp/client/app/android/java/res/layout/blimp_main.xml

Index: blimp/client/app/android/java/res/layout/blimp_main.xml
diff --git a/blimp/client/app/android/java/res/layout/blimp_main.xml b/blimp/client/app/android/java/res/layout/blimp_main.xml
index fb84581f46bbf90025d26e5f0e489196b7bfbca4..a5436c2f547e6f578053089f5f07bd0415ab6ef3 100644
--- a/blimp/client/app/android/java/res/layout/blimp_main.xml
+++ b/blimp/client/app/android/java/res/layout/blimp_main.xml
@@ -5,6 +5,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <RelativeLayout
+        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -14,6 +15,8 @@
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
             android:paddingStart="5dp"
             android:orientation="horizontal"
             android:gravity="center"
@@ -57,17 +60,12 @@
 
         <!-- Content Area -->
         <org.chromium.blimp.app.BlimpContentsDisplay
-            android:id="@+id/renderer"
+            android:id="@+id/contents_display"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/toolbar"/>
-
-        <include android:id="@+id/debug_stats"
-            layout="@layout/debug_stats_overlay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:visibility="invisible" />
-
+            android:layout_below="@id/toolbar" />
     </RelativeLayout>
 </merge>