Squash 4.3 changes

Conflicts:
	vm/Jni.cpp
	vm/Thread.cpp

Change-Id: Ib234d1bd492130f6e2c2bba0e54bdd4846e81163