Tools merger.  Nuke shoudl review this, likely errors in OTA

Change-Id: I547cd50eddd41c0f8ef1b0353a3cd2b19aef7b01