SKANK branding
Revert "get rid of otapackage tools"

This reverts commit 48b5c971e167eff499336f04efe16287758cfa0c.