Cleanup AppMenu code.

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

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2011 The Chromium Authors. All rights reserved.
+<!-- Copyright 2011 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.
 -->
 <!-- Layout for each item in the menu popup -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground">
     <TextView
         android:id="@+id/menu_item_text"
         android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
         android:layout_weight="1"
         android:layout_width="wrap_content"
         android:layout_height="?android:attr/listPreferredItemHeightSmall"
         android:layout_gravity="start"
         android:gravity="center_vertical"
         android:singleLine="true"
         android:paddingStart="9dp"
         android:paddingEnd="9dp" />
     <view
-        class="org.chromium.chrome.browser.appmenu.AppMenu$MenuItemIcon"
+        class="org.chromium.chrome.browser.appmenu.AppMenuItemIcon"
         android:id="@+id/menu_item_icon"
         android:layout_weight="0"
         android:layout_width="wrap_content"
         android:layout_height="?android:attr/listPreferredItemHeightSmall"
         android:layout_gravity="end"
         android:gravity="center_vertical"
         android:paddingEnd="8dp" />
 </LinearLayout>