fix for using alternate toolchain

Change-Id: Ieb45bb0379288d8fa07b2177b9e96fdb726e861b