update shooter and shootervm adds, removes, and deps

Change-Id: Ifb79db5b1a84dd011cb7f13fd0c33d77d93b93b4