Fixed build path and dependencies.

Change-Id: I3147512d7b26df583a55208cc703cbf22e4fc90d