Update tool to use a command

Bug: 63541
Change-Id: Iaeaf183dc2d906364d1dc69270bcf06c24ba833a