diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk
index 36475c3..2761404 100644
--- a/build/Android.oattest.mk
+++ b/build/Android.oattest.mk
@@ -71,20 +71,18 @@
 ART_TEST_OAT_TARGETS += test-art-target-oat-$(1)
 endef
 
-$(eval $(call declare-test-test-target,HelloWorld,))
+$(eval $(call declare-test-test-target,ExceptionTest,))
 $(eval $(call declare-test-test-target,Fibonacci,10))
+$(eval $(call declare-test-test-target,HelloWorld,))
 $(eval $(call declare-test-test-target,IntMath,))
 $(eval $(call declare-test-test-target,Invoke,))
-$(eval $(call declare-test-test-target,ExceptionTest,))
-$(eval $(call declare-test-test-target,SystemMethods,))
 $(eval $(call declare-test-test-target,MemUsage,))
+$(eval $(call declare-test-test-target,ParallelGC,))
 $(eval $(call declare-test-test-target,ReferenceMap,))
 $(eval $(call declare-test-test-target,StackWalk,))
+$(eval $(call declare-test-test-target,SystemMethods,))
 
 # TODO: Enable when the StackWalk2 tests are passing
 # $(eval $(call declare-test-test-target,StackWalk2,))
 
-# TODO: Enable when ParallelGC does not cause hang
-$(eval $(call declare-test-test-target,ParallelGC,))
-
 ########################################################################
diff --git a/src/thread.cc b/src/thread.cc
index af6c29d..4401bdb 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1198,7 +1198,7 @@
 }
 
 
-Thread* Thread::CurrentFromGdb() const {
+Thread* Thread::CurrentFromGdb() {
   return Thread::Current();
 }
 
diff --git a/src/thread.h b/src/thread.h
index 112a1ef..d345fdf 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -458,7 +458,7 @@
   void DumpStack(std::ostream& os) const;
 
   // Out-of-line conveniences for debugging in gdb.
-  Thread* CurrentFromGdb() const; // Like Thread::Current.
+  static Thread* CurrentFromGdb(); // Like Thread::Current.
   void DumpFromGdb() const; // Like Thread::Dump(std::cerr).
 
   void Attach(const Runtime* runtime);