Fixed build path and dependencies.

Change-Id: I025b523e5f7333265d6b3577a4333bce13e58e00