Cleanup the android scripts.

platform_tools/android/bin/android_kill_skia

Index: platform_tools/android/bin/android_kill_skia
diff --git a/platform_tools/android/bin/android_kill_skia b/platform_tools/android/bin/android_kill_skia
index a17f88d9736919289cb4e6bf2b832d81a2a849ee..f1bbef6ba85134b35cb394b3f655f5e7db19c639 100755
--- a/platform_tools/android/bin/android_kill_skia
+++ b/platform_tools/android/bin/android_kill_skia
@@ -6,27 +6,10 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source $SCRIPT_DIR/utils/setup_adb.sh
 
-SERIAL=""
-
-while (( "$#" )); do
-
-  if [[ "$1" == "-s" ]];
-  then
-    if [[ $# -lt 2 ]];
-    then
-      echo "ERROR: missing serial number"
-      exit 1;
-    fi
-    SERIAL="-s $2"
-    shift
-  fi
-  shift
-done
-
 if [ $(uname) == "Linux" ]; then
-    $ADB $SERIAL shell ps | grep skia | awk '{print $2}' | xargs -r $ADB $SERIAL shell kill
+    $ADB $DEVICE_SERIAL shell ps | grep skia | awk '{print $2}' | xargs -r $ADB $DEVICE_SERIAL shell kill
 elif [ $(uname) == "Darwin" ]; then
-    $ADB $SERIAL shell ps | grep skia | awk '{print $2}' | xargs $ADB $SERIAL shell kill
+    $ADB $DEVICE_SERIAL shell ps | grep skia | awk '{print $2}' | xargs $ADB $DEVICE_SERIAL shell kill
 else
     echo "Could not automatically determine OS!"
     exit 1;