Fix Bug 914310 - Switch make-api to use Webmaker Butler r=cade