Merge "Fix system server leaked fd dump"