Fix build and run-time dependencies

Change-Id: Ia75c85187774f9b6743333bdcd74b0b2d8842226