Fixed build path and dependencies.

Change-Id: Id20356f0d198bd3f9d67a07b0c246094926ba9b5