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

Change-Id: Ie98311479e1e2243858e20a3c18a3240f931f771