Merge "Improvements to setThreadSelf use." into dalvik-dev