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

Change-Id: Id73cff6a15033c9e900523eb0c08638e67fa0068