Fix project structure.

e0033629 missed some dependencies.

Change-Id: I76d46cc13666220d769f55ab332a1464444438dc
4 files changed