Update tool to use a command

Bug: 63541
Change-Id: Iaeaf183dc2d906364d1dc69270bcf06c24ba833a
(cherry picked from commit 01f3f8ee6791b6ae19775fa31da0bfc441baf807)