Update make files

Change-Id: Ie2a29347c5a1007541388b1f536a38f170118f6c