Fix dependencies on newer Ubuntu versions

Change-Id: Ifde8bcbb569424169623acc0ca05f8f8dcac6ad0