Revert "Support for new build-tools layout."

This reverts commit 7161b632fbb8294a4913eb3c30e77d9b91252b48.

Change-Id: I153caff5bd06553b91a27325d354a54cc470e476
6 files changed