Merge "Allow fs-verity setup within system_server"