Fixed build path and dependencies.

Change-Id: I95eec284571df8fd5f52f3f8f13bb369eff53974