am 4cdf1357: Merge "add otatools-package target"

* commit '4cdf1357433b407b350517779248e2194c88c3f4':
  add otatools-package target