Fixed build path and dependencies.

Change-Id: I33baf3eb485acd3a2574a63b51d95ba82d33fa39