Fixed build path and dependencies.

Change-Id: I9fa5309302fe97815ef0d1c099b7acdcb534d88f