Fixed build path and dependencies.

Change-Id: Ib2dff8a87620eeef8cb349bed46721c0b49b8aba