Updated release tools OTA script to fix build and partial clean up

OTA Script was broken after DHackers board flag for unified devices
was added

Also some cleaning

Change-Id: I6842ea241383adafa0274b7e0a60be63dba09354