Fixed build path and dependencies.

Change-Id: Ic2473a4ab3c789e91b2a5dd857aecf5d36192ca4