2013-03019: Fixed errors in tool chain build