Merge "Allow system_server and shell to start gsid on-demand."