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

Change-Id: I59ca5848315af22cab0960be8ffcae850e41716a