Merge "Stop packaging obsolete OTA tools." am: b98fa19703
am: e82ea963e8

* commit 'e82ea963e8cf5d7eb2dd6d2c7aacee86ddfba853':
  Stop packaging obsolete OTA tools.