Merge "init_kill_services_test: special case apexd"