Fix android_run_skia to work with multiple attached devices

platform_tools/android/bin/android_run_skia

 #!/bin/bash
 #
 # android_run_skia: starts the correct skia program on the device, prints the
 # output, and kills the app if interrupted.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source $SCRIPT_DIR/utils/setup_adb.sh
 
 APP_ARGS=""
@@ skipping 17 matching lines @@
   else
     APP_ARGS="$APP_ARGS $1"
   fi
 
 shift
 done
 
 
 if [[ "$USE_INTENT" == "true" ]];
 then
-    $ADB logcat -c
+    $ADB $SERIAL logcat -c
     $ADB $SERIAL shell am broadcast -a com.skia.intent.action.LAUNCH_SKIA -n com.skia/.SkiaReceiver -e args "$APP_ARGS"
     trap "echo \"Interrupt.\"" INT
-    eval "($ADB logcat)"
+    eval "($ADB $SERIAL logcat)"
     trap - INT
     echo "Interrupt. Killing Skia process..."
-    $SCRIPT_DIR/android_kill_skia
+    $SCRIPT_DIR/android_kill_skia $SERIAL
     echo "Done."
 else
     $ADB $SERIAL shell skia_launcher $APP_ARGS
 fi