Merge tag 'android-4.3_r2.1' into HEAD

Android 4.3 release 2.1

Conflicts:
	vm/Thread.cpp

Change-Id: Ibdd36522b96420fc38af33eca34ef1bc5506397e