Merge "Scrubbing broken tests and removing unnecessary organization AllTests.java files." into dalvik-dev