Build tool update

Change-Id: Ib6bb9fc8fe2502c6a1f645bcdd554209deba032d