Update from https://crrev.com/311076

build/android/adb_kill_chrome_shell

Index: build/android/adb_kill_chrome_shell
diff --git a/build/android/adb_kill_content_shell b/build/android/adb_kill_chrome_shell
similarity index 70%
copy from build/android/adb_kill_content_shell
copy to build/android/adb_kill_chrome_shell
index e379dd47149d145378d9a70253ff41db9092af19..2b63c9af3d24af629ab42222fdbf885bdd4cd433 100755
--- a/build/android/adb_kill_content_shell
+++ b/build/android/adb_kill_chrome_shell
@@ -4,14 +4,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# Kill a running content shell.
+# Kill a running chrome shell.
 #
 # Assumes you have sourced the build/android/envsetup.sh script.
 
-SHELL_PID_LINES=$(adb shell ps | grep ' org.chromium.content_shell_apk')
+SHELL_PID_LINES=$(adb shell ps | grep ' org.chromium.chrome.shell')
 VAL=$(echo "$SHELL_PID_LINES" | wc -l)
 if [ $VAL -lt 1 ] ; then
-   echo "Not running Content shell."
+   echo "Not running Chrome shell."
 else
    SHELL_PID=$(echo $SHELL_PID_LINES | awk '{print $2}')
    if [ "$SHELL_PID" != "" ] ; then
@@ -19,6 +19,6 @@ else
       adb shell kill $SHELL_PID
       set -
    else
-     echo "Content shell does not appear to be running."
+     echo "Chrome shell does not appear to be running."
    fi
 fi