simplify top-level Makefile some more

Change-Id: Ie1d53db34f812a83940196d0bf6e4ad8aaa8eab6