Fixed build path and dependencies.

Change-Id: I94931b51c9bd8ea3cfca011f8a6497314f7a408a