Fixed build path and dependencies.

Change-Id: I5dbb49a995f3ab7a5ef0c937894c5d1a2dbf6dcf