Merge "Allow builds with costum toolchains."
am: 1d9689b3e7

Change-Id: I240c81333172090d3d36a14c3a23d32017d30d5b