Merge "Zygote: do not preload Vulkan driver in Q" into qt-dev
am: d90f23c620

Change-Id: I73a044285f72e7b17ece1d747a355e5ab930520b