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

Change-Id: I6d3d7affcf2b478a87392e9f436174789b1a9c99