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

* commit 'c856bcb9c8dbc09849436d138239850eddfcbeab':