Revert "Build more stuff"

This reverts commit 2fdf33f36d471960d89e50aaa0a24cfee930da1e.

Change-Id: If2223a298a8f0bf226e2d767f8bc6721288e0df0
Merge "Revert "Build more stuff"" into lp5.0