cleaned up build

Change-Id: If73690f1c77f6716758f60019c3d8886d899894f
100 files changed