Remove unnecessary steps and duplicate code in droid build code. Also add
future proofing for droid actions in savegames.