Build tool fixes.
Build tool fixes.

aduros/flambe,markknol/flambe,playedonline/flambe,playedonline/flambe,Disar/flambe,aduros/flambe,markknol/flambe,Disar/flambe,playedonline/flambe,mikedotalmond/flambe,markknol/flambe,aduros/flambe,mikedotalmond/flambe,weilitao/flambe,mikedotalmond/flambe,Disar/flambe,playedonline/flambe,weilitao/flambe,aduros/flambe,weilitao/flambe,Disar/flambe,mikedotalmond/flambe,weilitao/flambe