Merge changes I9a390206,If3e9e846

* changes:
  build: separate dist tools and ota tools
  build: remove unused ota tools