Merge "Fix a critical space leak introduced by concurrent sweeping." into dalvik-dev