Merge "Improve a test for a bug I fixed in froyo." into dalvik-dev