Fixed build path and dependencies.

Change-Id: I081cedce4b7e2f48868ff8f1de66116b2e74c429