Merge "Add post fork hook for System Server"