Merge "Fix mark stack expand race." into dalvik-dev