As far as I can tell, there is not circular dependency, but make
complains, and only when invoked from toplevel, not from tail_build.
Looks like gbuild problem, but do a hackish change to make
unbreak clean compilation, for now.

Change-Id: I445ba343f9eaa988c60c288bf5fc1c5d1c7b67a5