Stop a few things from building for now.

Change-Id: I8f1c3be3a735dfebc33e86d6635e7eead85a211b