Fixed build path and dependencies.

Change-Id: I88b33116b98894317b887c4654fd1f68b2b3dc8d