Rename chromium_testshell target to chrome_shell_apk.

chrome/android/shell/res/layout/chrome_shell_activity.xml

 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright 2012 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.
  -->
 
 <org.chromium.chrome.shell.TabManager android:id="@+id/tab_manager"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <org.chromium.chrome.shell.TestShellToolbar android:id="@+id/toolbar"
+    <org.chromium.chrome.shell.ChromeShellToolbar android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:background="@drawable/progress">
         <EditText android:id="@+id/url"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="bottom"
             android:textSize="18sp"
             android:autoText="true"
             android:capitalize="sentences"
             android:singleLine="true"
             android:selectAllOnFocus="true"
             android:hint="@string/url_hint"
             android:inputType="textUri"
             android:imeOptions="actionGo" />
         <ImageButton android:id="@+id/menu_button"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:src="@drawable/menu_dots"
             android:background="?android:attr/selectableItemBackground"
             android:scaleType="center" />
-    </org.chromium.chrome.shell.TestShellToolbar>
+    </org.chromium.chrome.shell.ChromeShellToolbar>
     <FrameLayout android:id="@+id/content_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
     </FrameLayout>
 
 </org.chromium.chrome.shell.TabManager>