Merge "Fix Vulkan null_driver's EnumeratePhysicalDevices()"
am: 3a0c6aa2c4

Change-Id: Ic85e905db2cb5649992e20ca341b50f641f3d687