Merge "Apply most of dalvik-prebuild's fixes to the test suite." into dalvik-dev