[Fixed] droids now have vitality and lose some upon death

Change-Id: I8669e45c2d6b6da8c4fad0c30a3d411e52ebcb7f
Merge "[Fixed] droids now have vitality and lose some upon death" into unstable