Config setting for build diag timeoute

Change-Id: Ia1cac035d1fc640394ac0e933a7c3e69ef55081a