Clean up files overridden during build

Change-Id: I72691ab2af69912a760a04aef907e2d17a70b9a3