Top-level makefile comes from build directory again

Change-Id: Id9ec604339ae340c5f58ffc7d64d9a6523d7051b