Merge "add otatools-package target" into cw-d-mr1-dev