Merge "Refactor system weak sweeping, add support for modification." into dalvik-dev