Manually merge my AOSP update to the VM tests.

Original change: https://android-review.googlesource.com/32051

Bug: http://code.google.com/p/android/issues/detail?id=21599
Bug: http://code.google.com/p/android/issues/detail?id=21597
Change-Id: I31e440b66b720647afab54ca39fd6eb1bbb0cb60
diff --git a/test/084-class-init/src/SlowInit.java b/test/084-class-init/src/SlowInit.java
index 8ac72be..f0c6919 100644
--- a/test/084-class-init/src/SlowInit.java
+++ b/test/084-class-init/src/SlowInit.java
@@ -32,7 +32,7 @@
         FIELD0.setValue(111);
         FIELD1.setValue(222);
         printMsg("SlowInit static block pre-sleep");
-        Main.sleep(600);
+        Main.sleep(4000);
         printMsg("SlowInit static block post-sleep");
         FIELD2.setValue(333);
         FIELD3.setValue(444);