Merge "Set up fs-verity in system_server process"