vivow: round 1 of dependencies changes.

Change-Id: Id22f242399cc7aa8070508cf00c135a5a9d8fc01