Internal cleanup

* Make more targeted dependencies where we can
* Remove build targets for folders that are no longer there

Change-Id: I3477e7d2b06e6095badfed18f4977d26757ba3ea
12 files changed