Fixed build path and dependencies.

Change-Id: Ib7118a761b5c2556aa34337f1ab6fdc2634fa3c7