Pass origami-build-tools verify

o-hi @AlbertoElias, would you mind taking an o-quick look at this?  I should now pass `origami-build tools verify`.  o-thankyou!