Merge "add otatools-package target"