Fixed build path and dependencies.

Change-Id: I3b52f8feff0c887d49b2ebc715634fe2565ea6bc