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

Change-Id: I05a87440c1d18c9a4fe420a76fc877afd340903e