Fixed build path and dependencies.

Change-Id: Ic097f49af413dbe9d58e2e82144fdd874313106b