Fix build

Also remove unwanted binary files here

Change-Id: I1b52abbbfd3f67670fb5977f5430a1bb4dac22bb
24 files changed