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

Change-Id: I145de0963df0c199aa9ac249b403624c1a88af6e