shootervm: cleanup for shooter-common

Change-Id: I4a344d14be51be7f54c5c1b03bec92ec12afee35