Add back previously removed dependencies

Now that we can build with GTK3 and Vulkan, do so.
Change order of build deps to match upstream, making diffing easier.

Change-Id: If5250bb04e053cfc8df103de18eb22e37c7cc888