Fixed build path and dependencies.

Change-Id: I3e382363d417d1c49695e21a41f254923741c932