Jafier Build Tool update

Change-Id: Ifae194fa4fc49d6495d57744972617f65dd2741e