Fixed build path and dependencies.

Change-Id: I3e860c4b75c9151c8bb41bae736d87e98506248b