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

blimp/client/app/android/AndroidManifest.xml.jinja2

 <?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. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="{{manifest_package}}">
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ skipping 21 matching lines @@
                 <category android:name="android.intent.category.APP_BROWSER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
             </intent-filter>
         </activity>
-        <activity android:name="org.chromium.blimp.app.settings.Preferences"/>
+        <activity android:name="org.chromium.blimp.app.settings.Preferences"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
         <activity android:name="org.chromium.blimp.app.BrowserRestartActivity"
             android:launchMode="singleInstance"
             android:exported="false"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:excludeFromRecents="true"
             android:process=":browser_restart_process">
         </activity>
         <activity android:name="org.chromium.blimp.core.settings.MockPreferences"
                   android:launchMode="singleTask"
                   android:theme="@style/Theme.AppCompat.Light">
         </activity>
 
         <meta-data android:name="com.google.android.gms.version"
                 android:value="@integer/google_play_services_version" />
     </application>
 </manifest>