Fixed build path and dependencies.

Change-Id: I6ff4d740e3f7a57e28a461b4feb29c4133dc3460