Fixed build path and dependencies.

Change-Id: I9cc00b5defb11ca6829521be84ec8f46a126db8c