Merge "Moving Android-authored test to our test tree." into dalvik-dev