speedy: round 1 of dependencies changes.

Change-Id: Icd59bd603c5a43bd2cc0bf95987c307e62f5b089