Clean up ota tools

Change-Id: I78f9ecca56f8b7f87fea3b87076dc0f1f35ab0f7
Merge "Clean up ota tools" into jb-mr1