am d9cdf5be: am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev

* commit 'd9cdf5be20b8804d289da24e60724245ad7d15eb':
  add otatools-package target