am fb244224: merge from donut-gms

Merge commit 'fb244224235c33b492774f32e8caf8d43f2a3cec' into eclair

* commit 'fb244224235c33b492774f32e8caf8d43f2a3cec':
  Remove unnecessary preprocessing of monkey commands, fix bug where it didn't recognize '@', '+', '.', etc.
  adding a recorder function to collect output into an xml file; adding getvars and listvars command to MonkeyRunner
  Add runtest test def for cts-webkit.

diff --cc testrunner/test_defs.xml
index 04fcf99,55ddfdf..adb854e
--- 1/testrunner/test_defs.xml
--- 2/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@@ -317,8 -291,15 +317,15 @@@ See test_defs.xsd for more information
      coverage_target="framework"
      cts="true" />
  
+ <test name="cts-webkit"
+     build_path="cts/tests/tests/webkit"
+     package="com.android.cts.webkit"
+     runner="android.test.InstrumentationCtsTestRunner"
+     coverage_target="framework"
+     cts="true" />
+ 
  <test name="cts-widget"
 -    build_path="cts/tests"
 +    build_path="cts/tests/tests/widget"
      package="com.android.cts.widget"
      runner="android.test.InstrumentationCtsTestRunner"
      coverage_target="framework"