Merge "Fix two issues with the partial gc code." into dalvik-dev