Fixed build path and dependencies.

Change-Id: I64cd3523b091155d3e71a4b0f0152a35031da974