Merge change 21589 into eclair

* changes:
  Fix bug 2056252: android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing - Verify mInstrumentation is not null before calling getContext()