Backed out changesets 10bdfbe0195b and 06b0f332039d (bug 858687) because of Robocop failures (r=backout)

mobile/android/base/BrowserApp.java

@@ -683,7 +683,7 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     public View getActionBarLayout() {
-        RelativeLayout actionBar = (RelativeLayout) LayoutInflater.from(this).inflate(R.layout.browser_toolbar, null);
+        RelativeLayout actionBar = (RelativeLayout) LayoutInflater.from(this).inflate(R.layout.browser_toolbar_menu, null);
         actionBar.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT,
                                                                   (int) getResources().getDimension(R.dimen.browser_toolbar_height)));
         return actionBar;

mobile/android/base/Makefile.in

@@ -401,7 +401,7 @@ RES_LAYOUT = \
   res/layout/awesomebar_tab_indicator.xml \
   res/layout/awesomebar_tabs.xml \
   res/layout/bookmark_edit.xml \
-  res/layout/browser_toolbar.xml \
+  res/layout/browser_toolbar_menu.xml \
   res/layout/datetime_picker.xml \
   res/layout/doorhangerpopup.xml \
   res/layout/doorhanger.xml \
@@ -448,7 +448,7 @@ RES_LAYOUT = \
 
 RES_LAYOUT_LARGE_V11 = \
   res/layout-large-v11/awesomebar_search.xml \
-  res/layout-large-v11/browser_toolbar.xml \
+  res/layout-large-v11/browser_toolbar_menu.xml \
   $(NULL)
 
 RES_LAYOUT_LARGE_LAND_V11 = \