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

Change-Id: I2059141c1df064ce91eb1cd651837f9445b5efb2