Fixed build path and dependencies.

Change-Id: I18e9f2799feb2cd6d61c49450f0a05b26d003ce8