Fix android_run_skia to work with multiple attached devices

platform_tools/android/bin/android_kill_skia

Index: platform_tools/android/bin/android_kill_skia
===================================================================
--- platform_tools/android/bin/android_kill_skia	(revision 9137)
+++ platform_tools/android/bin/android_kill_skia	(working copy)
@@ -6,11 +6,28 @@
 
 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 shell ps | grep skia | awk '{print $2}' | xargs -r $ADB shell kill
+    $ADB $SERIAL shell ps | grep skia | awk '{print $2}' | xargs -r $ADB $SERIAL shell kill
 elif [ $(uname) == "Darwin" ]; then
-    $ADB shell ps | grep skia | awk '{print $2}' | xargs $ADB shell kill
+    $ADB $SERIAL shell ps | grep skia | awk '{print $2}' | xargs $ADB $SERIAL shell kill
 else
     echo "Could not automatically determine OS!"
     exit 1;
-fi
+fi