resolved conflicts for merge of 3eae287e to master

diff --cc vm/Dvm.mk
Simple merge

diff --cc vm/Thread.c
Simple merge

diff --cc vm/Thread.h
index 1b01e08,a829319..e12088d
--- 1/vm/Thread.h
--- 2/vm/Thread.h
+++ b/vm/Thread.h
@@@ -218,15 -222,8 +222,13 @@@ typedef struct Thread 
      const u2*   currentPc2;
  #endif
  
-     /* /proc/PID/task/TID/stat */
-     int statFile;
-     /* offset of state char in stat file, last we checked */
-     int stateOffset;
 +#if defined(WITH_SELF_VERIFICATION)
 +    /* Buffer for register state during self verification */
 +    struct ShadowSpace* shadowSpace;
 +#endif
 +
+     /* system thread state */
+     SystemThread* systemThread;
  } Thread;
  
  /* start point for an internal thread; mimics pthread args */