Merge "Tweak our test & runner so XPath tests can be executed on Hudson." into dalvik-dev