Fixed build path and dependencies.

Change-Id: I088b0057178cad47b3b6d67650a2e985269f876a