am c9343c0b: (-s ours) am cf129c53: am a7eaf450: Merge "Dist the otatools package."

* commit 'c9343c0bc316536772700926d555be42783fac62':