Updated project build files

Change-Id: I9433a3408e7e99621aeb05d1dd5303295d51c99d