Fixed build path and dependencies.

Change-Id: I0f19807722b33171bd698f06ab4b627c23fa04ee