shootervm: round 1 of dependencies changes

Change-Id: I38570805df24a1f0a37245188c708218185b1e08