Merge "Revert "Remove an unnecessary finger check when re-marking roots."" into dalvik-dev