Merge "Add jjb def for building it/dep into package"