Fixed build path and dependencies.

Change-Id: Ic0210736aef15218667e6e53d5cf8cd0f743a07e