Merge "Rename domain "system" to "system_server"."