cf406bda15
This lets us more easily specify the matrix of role/command/multiarch. Change-Id: Id519274f2de44ae9f27e900d7f9358cae69d13c6