Merge "Remove a bogus assumption about thread timing." into dalvik-dev